From f20f1f308d51c92b3fe9289037b173068bbe5419 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 16:55:41 -0400 Subject: [PATCH 01/23] --adminuser=admin -> Admin --- roles/moodle/templates/moodle_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index efbeb1859..5818f7a8f 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -3,6 +3,6 @@ sudo -u {{ apache_user }} /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ --wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle --dataroot={{ moodle_data }} \ --dbtype=pgsql --dbname={{ moodle_database_name }} --dbuser=Admin --dbpass=changeme \ --fullname=Your_School --shortname=School \ ---adminuser=admin --adminpass=changeme \ +--adminuser=Admin --adminpass=changeme \ --non-interactive --agree-license -chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php \ No newline at end of file +chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php From 930823ae151c71a69fa6a36cb1f03b264dd2d949 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 16:58:33 -0400 Subject: [PATCH 02/23] moodle_version: 31 -> 35 --- roles/moodle/defaults/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index 3f19aab8d..17def8bfc 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -1,9 +1,8 @@ -moodle_version: 31 +moodle_version: 35 moodle_repo_url: "https://github.com/moodle/moodle.git" moodle_base: "{{ iiab_base }}/moodle" moodle_user: moodle -moodle_install: True -moodle_enabled: False +#moodle_install: True +#moodle_enabled: False moodle_data: '{{ content_base }}/moodle' moodle_database_name: moodle - From f7a16070a540b4343ee7585aa382d2ffa3b45f9e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 17:01:26 -0400 Subject: [PATCH 03/23] Update main.yml --- roles/moodle/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 374d9fbd1..40b5a9ff8 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -44,7 +44,8 @@ dest: "{{ moodle_base }}" depth: 1 force: yes - version: "MOODLE_{{ moodle_version }}_STABLE" + #version: "MOODLE_{{ moodle_version }}_STABLE" + version: master #TEMPORARY DURING MAY 2018 TESTING # ignore_errors: yes when: internet_available and moodle.stat.exists is defined and not moodle.stat.exists From 3d6ebc90befcf863d008438c422d18f9bf79b11f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 17:05:30 -0400 Subject: [PATCH 04/23] Update main.yml --- roles/moodle/tasks/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 40b5a9ff8..80c9b304b 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -1,5 +1,4 @@ ---- -- name: Install Moodle required packages (OS's other than debunt) +- name: Install Moodle required packages (OS's other than debuntu) package: name: "{{ item }}" state: present @@ -107,7 +106,7 @@ postgresql_user: name: Admin password: changeme - encrypted: yes # Required by PostgresSQL 10.3+ e.g. on Ubuntu 18.04, see https://github.com/iiab/iiab/issues/759 + encrypted: yes # Required by PostgreSQL 10+ e.g. Ubuntu 18.04's PostgreSQL 10.3+, see https://github.com/iiab/iiab/issues/759 role_attr_flags: NOSUPERUSER,NOCREATEROLE,NOCREATEDB state: present become: yes From a98ad8f4c6ca085e151ee4a6ed9619925e0f4b9a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 17:56:25 -0400 Subject: [PATCH 05/23] experiment: revert to --adminuser=admin (from Admin) --- roles/moodle/templates/moodle_installer | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 5818f7a8f..34c9c0fbe 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -1,8 +1,17 @@ #!/bin/bash -x -sudo -u {{ apache_user }} /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ ---wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle --dataroot={{ moodle_data }} \ ---dbtype=pgsql --dbname={{ moodle_database_name }} --dbuser=Admin --dbpass=changeme \ ---fullname=Your_School --shortname=School \ ---adminuser=Admin --adminpass=changeme \ ---non-interactive --agree-license + +sudo -u {{ apache_user }} \ + /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ + --wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle \ + --dataroot={{ moodle_data }} \ + --dbtype=pgsql \ + --dbname={{ moodle_database_name }} \ + --dbuser=Admin --dbpass=changeme \ + --fullname=Your_School \ + --shortname=School \ + --adminuser=admin --adminpass=changeme \ + --non-interactive \ + --agree-license \ + --allow-unstable #TEMPORARY DURING MAY 2018 TESTING + chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php From 34bb55d172be1a9e4e0178168fb280c7f131c60f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:22:31 -0400 Subject: [PATCH 06/23] Update main.yml --- roles/moodle/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 80c9b304b..7dee936c2 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -70,7 +70,7 @@ mode: 0770 state: directory -- name: Remove stock Moodle conf +- name: Remove stock Moodle config file file: path: "/etc/{{ apache_config_dir }}/moodle.conf" state: absent @@ -114,7 +114,7 @@ - name: Create database postgresql_db: - name: moodle + name: {{ moodle_database_name }} encoding: utf8 owner: Admin template: template1 @@ -140,7 +140,7 @@ name: "{{ apache_service }}" state: restarted -- name: See if the config.php file exists +- name: See if config.php exists stat: path: "{{ moodle_base }}/config.php" register: config From 72b3b3760d6e10f0223aa0614ac50ee7ab979df7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:44:30 -0400 Subject: [PATCH 07/23] Update main.yml --- roles/moodle/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 7dee936c2..f04ed7723 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -114,7 +114,7 @@ - name: Create database postgresql_db: - name: {{ moodle_database_name }} + name: "{{ moodle_database_name }}" encoding: utf8 owner: Admin template: template1 From 49c97b1b00a80ac6ceee6cad7d1616eed548fa04 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:50:09 -0400 Subject: [PATCH 08/23] Update moodle_installer --- roles/moodle/templates/moodle_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 34c9c0fbe..2f988125e 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -9,9 +9,9 @@ sudo -u {{ apache_user }} \ --dbuser=Admin --dbpass=changeme \ --fullname=Your_School \ --shortname=School \ - --adminuser=admin --adminpass=changeme \ + --adminuser=admin --adminpass=changeme \ # May 2018: lowercase "admin" is still required, otherwise Admin/changeme fails at http://box.lan/moodle --non-interactive \ --agree-license \ - --allow-unstable #TEMPORARY DURING MAY 2018 TESTING + --allow-unstable # TEMPORARY DURING MAY 2018 TESTING chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php From 780a846d51ca4116e9083a2f1f6ee6ac0cf8f52a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:51:01 -0400 Subject: [PATCH 09/23] Update main.yml --- roles/moodle/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index f04ed7723..07a05ed2d 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -44,7 +44,7 @@ depth: 1 force: yes #version: "MOODLE_{{ moodle_version }}_STABLE" - version: master #TEMPORARY DURING MAY 2018 TESTING + version: master # TEMPORARY DURING MAY 2018 TESTING # ignore_errors: yes when: internet_available and moodle.stat.exists is defined and not moodle.stat.exists From f264b60172fa08093eceb8b72106c2f9300b9d27 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:19:23 -0400 Subject: [PATCH 10/23] Update main.yml --- roles/moodle/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index 17def8bfc..a1462d53a 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -1,5 +1,6 @@ moodle_version: 35 -moodle_repo_url: "https://github.com/moodle/moodle.git" +#moodle_repo_url: "https://github.com/moodle/moodle.git" +moodle_repo_url: "git://git.moodle.org/moodle.git" moodle_base: "{{ iiab_base }}/moodle" moodle_user: moodle #moodle_install: True From 638eedd3769c1abd0d20ddc73673a2f31e04a327 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:33:24 -0400 Subject: [PATCH 11/23] Update moodle_installer --- roles/moodle/templates/moodle_installer | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 2f988125e..38f729816 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -1,5 +1,10 @@ #!/bin/bash -x +# May 2018: lowercase "--adminuser=admin" is still required for some odd +# reason, otherwise one cannot login to http://box.lan/moodle +# (with Admin/changeme). At the same time --dbuser=Admin still begins with +# a capital letter, in keeping with Internet-in-a-Box's other server apps. + sudo -u {{ apache_user }} \ /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ --wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle \ @@ -9,7 +14,7 @@ sudo -u {{ apache_user }} \ --dbuser=Admin --dbpass=changeme \ --fullname=Your_School \ --shortname=School \ - --adminuser=admin --adminpass=changeme \ # May 2018: lowercase "admin" is still required, otherwise Admin/changeme fails at http://box.lan/moodle + --adminuser=admin --adminpass=changeme \ --non-interactive \ --agree-license \ --allow-unstable # TEMPORARY DURING MAY 2018 TESTING From 36462bffffdcb67cf6ff7ddeb122145af7a266e9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:35:22 -0400 Subject: [PATCH 12/23] Update moodle_installer --- roles/moodle/templates/moodle_installer | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 38f729816..d28808161 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -1,9 +1,9 @@ #!/bin/bash -x # May 2018: lowercase "--adminuser=admin" is still required for some odd -# reason, otherwise one cannot login to http://box.lan/moodle -# (with Admin/changeme). At the same time --dbuser=Admin still begins with -# a capital letter, in keeping with Internet-in-a-Box's other server apps. +# reason, otherwise one cannot login to http://box.lan/moodle (with +# Admin/changeme). At the same time --dbuser=Admin still begins with +# a capital letter, in keeping with Internet-in-a-Box's other server apps? sudo -u {{ apache_user }} \ /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ From fbdb19718e316bf22aeb4cf8cec15f63a3fec4ef Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:37:33 -0400 Subject: [PATCH 13/23] Update main.yml --- roles/moodle/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index a1462d53a..045496194 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -2,7 +2,7 @@ moodle_version: 35 #moodle_repo_url: "https://github.com/moodle/moodle.git" moodle_repo_url: "git://git.moodle.org/moodle.git" moodle_base: "{{ iiab_base }}/moodle" -moodle_user: moodle +#moodle_user: moodle #moodle_install: True #moodle_enabled: False moodle_data: '{{ content_base }}/moodle' From ef903488c97097535b15b7f1d18ee887efb73a8d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 1 May 2018 10:50:00 -0400 Subject: [PATCH 14/23] indentation cleanup --- roles/moodle/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 07a05ed2d..8e512abab 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -15,10 +15,10 @@ - python-psycopg2 - php{{ php_version }}-pgsql - php{{ php_version }}-curl -# - php{{ php_version }}-zip + #- php{{ php_version }}-zip - php{{ php_version }}-gd -# - php{{ php_version }}-mbstring -# mbstring is now included in php-cli + #- php{{ php_version }}-mbstring + # mbstring is now included in php-cli - php{{ php_version }}-cli when: is_debuntu @@ -45,7 +45,7 @@ force: yes #version: "MOODLE_{{ moodle_version }}_STABLE" version: master # TEMPORARY DURING MAY 2018 TESTING -# ignore_errors: yes + #ignore_errors: yes when: internet_available and moodle.stat.exists is defined and not moodle.stat.exists - name: Prepare the downloaded directory so Apache can install config file @@ -150,7 +150,7 @@ when: config.stat.exists is defined and not config.stat.exists - name: Give Apache permission to read config file -# command: chown -R {{ apache_user }} {{ moodle_base }} + #command: chown -R {{ apache_user }} {{ moodle_base }} file: path: "{{ moodle_base }}/config.php" mode: 0644 From 4ed7c38f4f25391aa2842f6c620db5c04f7ae03a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 1 May 2018 14:40:04 -0500 Subject: [PATCH 15/23] NM not playing nice on ubuntu-16, use older method --- roles/network/tasks/main.yml | 4 ++-- vars/default_vars.yml | 1 + vars/ubuntu-16.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index f1adc8d92..6e73f7d4c 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -106,7 +106,7 @@ - name: NetworkManager in use include_tasks: NM-debian.yml - when: is_debuntu and network_manager_active + when: is_ubuntu_18 and network_manager_active #and not installing tags: - network @@ -127,7 +127,7 @@ - name: Not RPi, Not NetworkManager, Not systemd-networkd in use include_tasks: debian.yml - when: not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu + when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16 #and not installing tags: - network diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 1632d1f80..2c6a94a62 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -383,6 +383,7 @@ xovis_chart_heading: "My School: Usage Data Visualization" # wide to narrow is_debuntu: False is_ubuntu: False +is_ubuntu_16: False is_ubuntu_18: False is_debian: False is_debian_9: False diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index 013e385a2..741e3b012 100644 --- a/vars/ubuntu-16.yml +++ b/vars/ubuntu-16.yml @@ -1,5 +1,6 @@ is_debuntu: True is_ubuntu: True +is_ubuntu_16: True dns_service: bind9 dns_user: bind dhcp_service: isc-dhcp-server From 748235c4b767b99edb1ed9bb65ff6273d7a1ab31 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 1 May 2018 15:55:05 -0500 Subject: [PATCH 16/23] start hostapd before dhcpd --- roles/network/templates/dhcp/dhcpd.service | 2 +- roles/network/templates/hostapd/hostapd.service.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/templates/dhcp/dhcpd.service b/roles/network/templates/dhcp/dhcpd.service index 5313bfa7e..7dff71264 100644 --- a/roles/network/templates/dhcp/dhcpd.service +++ b/roles/network/templates/dhcp/dhcpd.service @@ -1,6 +1,6 @@ [Unit] Description=DHCPv4 Server Daemon -After=network-online.target +After=rc-local.service [Service] EnvironmentFile=/etc/sysconfig/dhcpd diff --git a/roles/network/templates/hostapd/hostapd.service.j2 b/roles/network/templates/hostapd/hostapd.service.j2 index 0a7b9c22d..09d3862b0 100644 --- a/roles/network/templates/hostapd/hostapd.service.j2 +++ b/roles/network/templates/hostapd/hostapd.service.j2 @@ -1,6 +1,6 @@ [Unit] Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator -After=rc-local.service +After=network-online.target [Service] Type=idle From 165f4270c2aedf8b04c03a3fda498214996dd2c0 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 2 May 2018 12:44:27 -0500 Subject: [PATCH 17/23] use py-installer.yml for 18.04 --- roles/calibre/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index eb771e161..c09aa03ba 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -3,16 +3,16 @@ # RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST - name: Install Calibre via calibre-installer.py (redhat, ubuntu, debian if NOT calibre_debs_on_debian) include_tasks: py-installer.yml - when: is_redhat or (is_ubuntu and not is_ubuntu_18) or (is_debian and not calibre_debs_on_debian) + when: is_redhat or is_ubuntu or (is_debian and not calibre_debs_on_debian) #when: not is_rpi - name: Install Calibre via .debs (Raspbian, Debian if calibre_debs_on_debian) include_tasks: debs.yml when: is_rpi or (is_debian and calibre_debs_on_debian) -- name: Install Calibre via .debs (Ubuntu 18.xx) - include_tasks: debs.yml - when: is_ubuntu_18 +#- name: Install Calibre via .debs (Ubuntu 18.xx) +# include_tasks: debs.yml +# when: is_ubuntu_18 - name: Create calibre-serve.service and calibre.conf template: From e2c641e9747809ff2e266f2f0f717f44bfdd43d5 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 2 May 2018 12:38:09 -0500 Subject: [PATCH 18/23] allow br0 removel --- roles/network/tasks/NM-debian.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml index 23ecc9dd2..72f91683d 100644 --- a/roles/network/tasks/NM-debian.yml +++ b/roles/network/tasks/NM-debian.yml @@ -18,6 +18,12 @@ src: network/bridge-br0 mode: 0600 +- name: Remove br0 in Appliance Mode for NetworkManager + file: + dest: /etc/NetworkManager/system-connections/bridge-br0 + state: absent + when: iiab_network_mode == "Appliance" + - name: Stop wpa_supplicant service service: name: wpa_supplicant From 0a84a5e9a70d789335ead054b24f431c73ad87cc Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 2 May 2018 12:38:24 -0500 Subject: [PATCH 19/23] fix detection --- roles/network/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index b4cee63a2..dc7c4bc7f 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -19,8 +19,8 @@ discovered_wired_iface: "none" discovered_wireless_iface: "none" #Redhat -iiab_wired_lan_iface: "none" -iiab_wireless_lan_iface: "none" +#iiab_wired_lan_iface: "none" +#iiab_wireless_lan_iface: "none" has_WAN: False has_ifcfg_gw: "none" has_wifi_gw: "none" From 039b584fb2251a5c9f9eb2555e519dd5049bb21e Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 2 May 2018 18:39:53 -0500 Subject: [PATCH 20/23] systemd-networkd fix-ups --- roles/network/tasks/sysd-netd-debian.yml | 4 +++- roles/network/templates/network/systemd-br0-network.j2 | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 08e09f1bc..8019d9872 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -3,17 +3,19 @@ template: dest: /etc/systemd/network/IIAB-Bridge.netdev src: network/systemd-br0.j2 + when: iiab_lan_iface == "br0" - name: Copy the bridge script - Assigns IP address template: dest: /etc/systemd/network/IIAB-Bridge.network src: network/systemd-br0-network.j2 + when: iiab_lan_iface == "br0" - name: Copy the bridge script - Assigns br0 wired slaves template: dest: /etc/systemd/network/IIAB-Slave.network src: network/systemd-br0-slave.j2 - when: iiab_wired_lan_iface is defined + when: iiab_wired_lan_iface is defined and iiab_lan_iface == "br0" - name: Stopping services include_tasks: down-debian.yml diff --git a/roles/network/templates/network/systemd-br0-network.j2 b/roles/network/templates/network/systemd-br0-network.j2 index c524a50a7..53e99fdd7 100644 --- a/roles/network/templates/network/systemd-br0-network.j2 +++ b/roles/network/templates/network/systemd-br0-network.j2 @@ -3,13 +3,9 @@ Name=br0 [Network] -Bridge=br0 +Address={{ lan_ip }}/19 LinkLocalAddressing=no DNS={{ lan_ip }} Domains={{ iiab_domain }} -[Address] -Address={{ lan_ip }}/19 -[Route] -Gateway="" From 76e84bec8ba6433b715aa3394f52cdb4300b22f8 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 2 May 2018 20:56:02 -0500 Subject: [PATCH 21/23] dhcpd staging --- roles/network/templates/dhcp/dhcpd.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/network/templates/dhcp/dhcpd.service b/roles/network/templates/dhcp/dhcpd.service index 7dff71264..f09734779 100644 --- a/roles/network/templates/dhcp/dhcpd.service +++ b/roles/network/templates/dhcp/dhcpd.service @@ -1,6 +1,7 @@ [Unit] Description=DHCPv4 Server Daemon -After=rc-local.service +After=multi-user.target +Requires=multi-user.target [Service] EnvironmentFile=/etc/sysconfig/dhcpd From e74cc9e241c4f04c0993ee5f4d01616786b6edc8 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 3 May 2018 07:51:25 -0500 Subject: [PATCH 22/23] Disable and mask systemd-networkd-wait-online on ubuntu-18 --- roles/network/tasks/sysd-netd-debian.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 8019d9872..68af9fc45 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -20,6 +20,14 @@ - name: Stopping services include_tasks: down-debian.yml +- name: Disable and mask systemd-networkd-wait-online + systemd: + name: systemd-networkd-wait-online + enabled: no + masked: yes + state: stopped + when: is_ubuntu_18 + - name: Reload systemd systemd: daemon_reload: yes From 1dda6adf6d7517a211e75312ede93ad5ea0da807 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 3 May 2018 09:40:08 -0500 Subject: [PATCH 23/23] Disable isc-dhcp-server6.service on ubuntu-18 --- roles/network/tasks/dhcpd.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/network/tasks/dhcpd.yml b/roles/network/tasks/dhcpd.yml index 3896c6381..9b8886342 100644 --- a/roles/network/tasks/dhcpd.yml +++ b/roles/network/tasks/dhcpd.yml @@ -23,6 +23,12 @@ state=stopped when: is_debuntu +- name: Disable stock dhcp_service ipv6 + service: name={{ dhcp_service }}6 + enabled=no + state=stopped + when: is_ubuntu_18 + - name: Install systemd unit file to /etc/systemd/system/dhcpd.service template: src={{ item.src }} dest={{ item.dest }}