From 3e486d7fcf6d5b8877d377401361564c3420d363 Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Mon, 6 Jan 2020 13:58:48 +0000 Subject: [PATCH] fix #1419 rename xsce stuff to iiab --- roles/httpd/templates/010-iiab.conf.j2 | 4 ++-- roles/network/templates/network/br0.j2 | 2 +- roles/network/templates/network/ifcfg-WAN.j2 | 2 +- roles/network/templates/network/ifcfg-slave.j2 | 2 +- roles/network/templates/network/ifcfg.j2 | 2 +- roles/network/templates/network/wifi-slave.j2 | 2 +- roles/rachel/README.rst | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2 index fed0b0210..ef2492c36 100755 --- a/roles/httpd/templates/010-iiab.conf.j2 +++ b/roles/httpd/templates/010-iiab.conf.j2 @@ -1,7 +1,7 @@ # This configuration file supplements the main Apache # server configuration file (conf/httpd.conf). It contains the # configuration directives that specifically relate to the -# XSCE Schoolserver. +# IIAB Schoolserver. # # Some of the choices are a bit subjective, but in general directives # that are still valid in 2.4 are left if they override something @@ -214,7 +214,7 @@ DocumentRoot "{{ doc_root }}" # negotiated documents. The MultiViews Option can be used for the # same purpose, but it is much slower. # -# XSCE has both multiview and .var strategies +# IIAB has both multiview and .var strategies DirectoryIndex index.html index.html.var diff --git a/roles/network/templates/network/br0.j2 b/roles/network/templates/network/br0.j2 index d59ccd5df..9660aed4b 100644 --- a/roles/network/templates/network/br0.j2 +++ b/roles/network/templates/network/br0.j2 @@ -1,4 +1,4 @@ -# generated by XSCE +# generated by IIAB # gui_desired_network_role is {{ gui_desired_network_role }} # we always want the wireless to be configured (and under bridge) diff --git a/roles/network/templates/network/ifcfg-WAN.j2 b/roles/network/templates/network/ifcfg-WAN.j2 index 8e1387442..1498ef9dd 100644 --- a/roles/network/templates/network/ifcfg-WAN.j2 +++ b/roles/network/templates/network/ifcfg-WAN.j2 @@ -1,4 +1,4 @@ -# Generated by XSCE +# Generated by IIAB NAME="iiab-WAN" TYPE="Ethernet" DEFROUTE="yes" diff --git a/roles/network/templates/network/ifcfg-slave.j2 b/roles/network/templates/network/ifcfg-slave.j2 index 30947af05..06e575e06 100644 --- a/roles/network/templates/network/ifcfg-slave.j2 +++ b/roles/network/templates/network/ifcfg-slave.j2 @@ -1,4 +1,4 @@ -# Generated by XSCE +# Generated by IIAB TYPE=Ethernet BOOTPROTO=none BRIDGE=br0 diff --git a/roles/network/templates/network/ifcfg.j2 b/roles/network/templates/network/ifcfg.j2 index d109d6eb5..d551636ab 100644 --- a/roles/network/templates/network/ifcfg.j2 +++ b/roles/network/templates/network/ifcfg.j2 @@ -1,4 +1,4 @@ -# Generated by XSCE +# Generated by IIAB {% if iiab_lan_iface == "br0" %} DEVICE=br0 TYPE=Bridge diff --git a/roles/network/templates/network/wifi-slave.j2 b/roles/network/templates/network/wifi-slave.j2 index 5985aecb4..39040d16d 100644 --- a/roles/network/templates/network/wifi-slave.j2 +++ b/roles/network/templates/network/wifi-slave.j2 @@ -1,4 +1,4 @@ -# Generated by XSCE for wifi-slave +# Generated by IIAB for wifi-slave # used mostly for the NM_CONTROLLED part TYPE=Ethernet BOOTPROTO=none diff --git a/roles/rachel/README.rst b/roles/rachel/README.rst index 31aa1453d..08df5a8f2 100644 --- a/roles/rachel/README.rst +++ b/roles/rachel/README.rst @@ -2,7 +2,7 @@ RACHEL README ============= -This is the second pass at adding RACHEL (http://www.rachel.worldpossible.org/) to XSCE. +This is the second pass at adding RACHEL (http://www.rachel.worldpossible.org/) to IIAB. It takes RACHEL in its entirety and the download must be copied manually. This version is based on rachelusb_32EN_3.1.5.zip.