From ae2c621071c4eead1cbb5866c2171acd4db64946 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Feb 2020 19:15:56 -0500 Subject: [PATCH 1/6] Cleaner MediaWiki playbook --- roles/mediawiki/defaults/main.yml | 2 +- roles/mediawiki/tasks/apache.yml | 12 ++++++ roles/mediawiki/tasks/enable.yml | 62 ----------------------------- roles/mediawiki/tasks/install.yml | 34 ++++++++-------- roles/mediawiki/tasks/main.yml | 65 ++++++++++++++++++++++++++++--- roles/mediawiki/tasks/nginx.yml | 16 ++++++++ 6 files changed, 105 insertions(+), 86 deletions(-) create mode 100644 roles/mediawiki/tasks/apache.yml delete mode 100644 roles/mediawiki/tasks/enable.yml create mode 100644 roles/mediawiki/tasks/nginx.yml diff --git a/roles/mediawiki/defaults/main.yml b/roles/mediawiki/defaults/main.yml index f650561f4..2f49d7548 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -29,4 +29,4 @@ mediawiki_abs_path: "{{ mediawiki_install_path }}/mediawiki-{{ mediawiki_version mediawiki_url: /wiki mediawiki_url2: /mediawiki mediawiki_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ mediawiki_url }}" # http://box.lan/wiki -mediawiki_symlink: w # can also be mwlink. NO slashes as they are suppplied as needed in the code +mediawiki_symlink: w # Can also be mwlink. NO slashes as they are supplied as needed in the code diff --git a/roles/mediawiki/tasks/apache.yml b/roles/mediawiki/tasks/apache.yml new file mode 100644 index 000000000..d7669f548 --- /dev/null +++ b/roles/mediawiki/tasks/apache.yml @@ -0,0 +1,12 @@ +- name: Enable http://box{{ mediawiki_url }} via Apache # http://box/wiki + command: a2ensite mediawiki.conf + when: mediawiki_enabled | bool + +- name: Disable http://box{{ mediawiki_url }} via Apache # http://box/wiki + command: a2dissite mediawiki.conf + when: not mediawiki_enabled + +- name: Restart '{{ apache_service }}' systemd service + systemd: + name: "{{ apache_service }}" # apache2 or httpd, as set in /opt/iiab/iiab/vars/.yml + state: restarted diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml deleted file mode 100644 index df0ed43cd..000000000 --- a/roles/mediawiki/tasks/enable.yml +++ /dev/null @@ -1,62 +0,0 @@ -# Apache - -- name: Enable http://box{{ mediawiki_url }} via Apache # i.e. http://box/wiki - command: a2ensite mediawiki.conf - when: apache_install and mediawiki_enabled - -- name: Disable http://box{{ mediawiki_url }} via Apache - command: a2dissite mediawiki.conf - when: apache_install and not mediawiki_enabled - -- name: Restart Apache systemd service ({{ apache_service }}) - systemd: - name: "{{ apache_service }}" # apache2 or httpd, as set in /opt/iiab/iiab/vars/.yml - state: restarted - when: apache_enabled | bool - -# NGINX - -- name: Enable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by installing {{ nginx_conf_dir }}/mediawiki-nginx.conf from template - template: - src: mediawiki-nginx.conf.j2 - dest: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" - when: nginx_install and mediawiki_enabled - -- name: Disable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by removing {{ nginx_conf_dir }}/mediawiki-nginx.conf - file: - path: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" - state: absent - when: nginx_install and not mediawiki_enabled - -- name: Restart 'nginx' systemd service - systemd: - name: nginx - state: restarted - when: nginx_enabled | bool - - -- name: Add 'mediawiki' variable values to {{ iiab_ini_file }} - ini_file: - path: "{{ iiab_ini_file }}" - section: mediawiki - option: "{{ item.option }}" - value: "{{ item.value | string }}" - with_items: - - option: name - value: MediaWiki - - option: description - value: '"MediaWiki is a blog and web site management application, from the people who create Wikipedia."' - - option: mediawiki_src - value: "{{ mediawiki_src }}" - - option: mediawiki_abs_path - value: "{{ mediawiki_abs_path }}" - - option: mediawiki_db_name - value: "{{ mediawiki_db_name }}" - - option: mediawiki_db_user - value: "{{ mediawiki_db_user }}" - - option: mediawiki_url - value: "{{ mediawiki_url }}" - - option: mediawiki_full_url - value: "{{ mediawiki_full_url }}" - - option: mediawiki_enabled - value: "{{ mediawiki_enabled }}" diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 3b8151a1b..006381b72 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -8,43 +8,43 @@ - name: Download {{ mediawiki_download_base_url }}/{{ mediawiki_src }} to {{ downloads_dir }} get_url: url: "{{ mediawiki_download_base_url }}/{{ mediawiki_src }}" - dest: "{{ downloads_dir }}" + dest: "{{ downloads_dir }}" # /opt/iiab/downloads timeout: "{{ download_timeout }}" #force: yes #backup: yes when: internet_available | bool -- name: Unpack it to permanent location {{ mediawiki_abs_path }} +- name: Unarchive (unpack) it to permanent location {{ mediawiki_abs_path }} ({{ apache_user }}:{{ apache_user }}, u+rw,g+r,o+r) unarchive: src: "{{ downloads_dir }}/{{ mediawiki_src }}" - dest: "{{ mediawiki_install_path }}" + dest: "{{ mediawiki_install_path }}" # /library owner: "{{ apache_user }}" group: "{{ apache_user }}" mode: u+rw,g+r,o+r # '0755' forced executable bits on files keep_newer: yes -- name: Create symlink {{ doc_root }}/{{ mediawiki_symlink }} -> {{ mediawiki_abs_path }} +- name: Symlink {{ doc_root }}/{{ mediawiki_symlink }} -> {{ mediawiki_abs_path }} file: - src: "{{ mediawiki_abs_path }}" - path: "{{ doc_root }}/{{ mediawiki_symlink }}" + src: "{{ mediawiki_abs_path }}" # /library/mediawiki-1.XY.Z + path: "{{ doc_root }}/{{ mediawiki_symlink }}" # /library/www/html/w state: link - name: Start MySQL systemd service ({{ mysql_service }}) so we can create db systemd: - state: started name: "{{ mysql_service }}" + state: started - name: Create MySQL database {{ mediawiki_db_name }} mysql_db: - name: "{{ mediawiki_db_name }}" - state: present + name: "{{ mediawiki_db_name }}" # iiab_mediawiki + #state: present - name: Create MySQL database user {{ mediawiki_db_user }} with password, and permissions to above db mysql_user: - name: "{{ mediawiki_db_user }}" + name: "{{ mediawiki_db_user }}" # iiab_mediawiki_user password: "{{ mediawiki_db_user_password }}" priv: "{{ mediawiki_db_name }}.*:ALL,GRANT" - state: present + #state: present - name: Configure MediaWiki, if {{ mediawiki_abs_path }}/LocalSettings.php doesn't exist shell: > @@ -61,29 +61,29 @@ "{{ mediawiki_site_name }}" "{{ mediawiki_admin_user }}" args: - chdir: "{{ mediawiki_abs_path }}" + chdir: "{{ mediawiki_abs_path }}" # /library/mediawiki-1.XY.Z creates: "{{ mediawiki_abs_path }}/LocalSettings.php" - name: Configure wgArticlePath variable in {{ mediawiki_abs_path }}/LocalSettings.php lineinfile: - dest: "{{ mediawiki_abs_path }}/LocalSettings.php" + path: "{{ mediawiki_abs_path }}/LocalSettings.php" # /library/mediawiki-1.XY.Z line: '$wgArticlePath = "/wiki/$1";' - name: Configure $wgUsePathInfo variable in {{ mediawiki_abs_path }}/LocalSettings.php lineinfile: - dest: "{{ mediawiki_abs_path }}/LocalSettings.php" + path: "{{ mediawiki_abs_path }}/LocalSettings.php" # /library/mediawiki-1.XY.Z line: '$wgUsePathInfo = true;' - name: Configure $wgServer variable in {{ mediawiki_abs_path }}/LocalSettings.php lineinfile: - dest: "{{ mediawiki_abs_path }}/LocalSettings.php" + path: "{{ mediawiki_abs_path }}/LocalSettings.php" # /library/mediawiki-1.XY.Z regexp: '^\$wgServer =' line: '$wgServer = "//" . $_SERVER["HTTP_HOST"];' - name: Install /etc/{{ apache_conf_dir }}/mediawiki.conf from template, for http://box{{ mediawiki_url }} via Apache template: src: mediawiki.conf.j2 - dest: "/etc/{{ apache_conf_dir }}/mediawiki.conf" + dest: "/etc/{{ apache_conf_dir }}/mediawiki.conf" # apache2/sites-availableon debuntu # RECORD MediaWiki AS INSTALLED @@ -94,6 +94,6 @@ - name: "Add 'mediawiki_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^mediawiki_installed' line: 'mediawiki_installed: True' diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index df4bbcc74..10d15f273 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -1,7 +1,60 @@ -- name: Install MediaWiki {{ mediawiki_version }} - include_tasks: install.yml - when: mediawiki_install and not mediawiki_installed is defined +# "How do i fail a task in Ansible if the variable contains a boolean value? +# I want to perform input validation for Ansible playbooks" +# https://stackoverflow.com/questions/46664127/how-do-i-fail-a-task-in-ansible-if-the-variable-contains-a-boolean-value-i-want/46667499#46667499 -- name: Enable MediaWiki - include_tasks: enable.yml - when: mediawiki_install or mediawiki_installed is defined +# We assume 0-init/tasks/validate_vars.yml has DEFINITELY been run, so no need +# to re-check whether vars are defined here. As Ansible vars cannot be unset: +# https://serverfault.com/questions/856729/how-to-destroy-delete-unset-a-variable-value-in-ansible + +- name: Assert that "mediawiki_install is sameas true" (boolean not string etc) + assert: + that: mediawiki_install is sameas true + fail_msg: "PLEASE SET 'mediawiki_install: True' e.g. IN: /etc/iiab/local_vars.yml" + quiet: yes + +- name: Assert that "mediawiki_enabled | type_debug == 'bool'" (boolean not string etc) + assert: + that: mediawiki_enabled | type_debug == 'bool' + fail_msg: "PLEASE GIVE VARIABLE 'mediawiki_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" + quiet: yes + + +- name: Install MediaWiki {{ mediawiki_version }} if 'mediawiki_installed' not defined, e.g. in {{ iiab_state_file }} # /etc/iiab/iiab_state.yml + include_tasks: install.yml + when: mediawiki_installed is undefined + + +- name: Enable/Disable/Restart Apache if primary + include_tasks: apache.yml + when: not nginx_enabled + +- name: Enable/Disable/Restart NGINX if primary + include_tasks: nginx.yml + when: nginx_enabled | bool + + +- name: Add 'mediawiki' variable values to {{ iiab_ini_file }} + ini_file: + path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini + section: mediawiki + option: "{{ item.option }}" + value: "{{ item.value | string }}" + with_items: + - option: name + value: MediaWiki + - option: description + value: '"MediaWiki is a blog and web site management application, from the people who create Wikipedia."' + - option: mediawiki_src + value: "{{ mediawiki_src }}" + - option: mediawiki_abs_path + value: "{{ mediawiki_abs_path }}" + - option: mediawiki_db_name + value: "{{ mediawiki_db_name }}" + - option: mediawiki_db_user + value: "{{ mediawiki_db_user }}" + - option: mediawiki_url + value: "{{ mediawiki_url }}" + - option: mediawiki_full_url + value: "{{ mediawiki_full_url }}" + - option: mediawiki_enabled + value: "{{ mediawiki_enabled }}" diff --git a/roles/mediawiki/tasks/nginx.yml b/roles/mediawiki/tasks/nginx.yml new file mode 100644 index 000000000..5c4caee08 --- /dev/null +++ b/roles/mediawiki/tasks/nginx.yml @@ -0,0 +1,16 @@ +- name: Enable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by installing {{ nginx_conf_dir }}/mediawiki-nginx.conf from template # http://box/wiki & http://box/mediawiki + template: + src: mediawiki-nginx.conf.j2 + dest: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" # /etc/nginx.conf.d + when: mediawiki_enabled | bool + +- name: Disable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by removing {{ nginx_conf_dir }}/mediawiki-nginx.conf # http://box/wiki & http://box/mediawiki + file: + path: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" # /etc/nginx.conf.d + state: absent + when: not mediawiki_enabled + +- name: Restart 'nginx' systemd service + systemd: + name: nginx + state: restarted From 6110587e659ab821160e35c47db05f4aa9b80bcf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Feb 2020 19:31:10 -0500 Subject: [PATCH 2/6] Typo in mediawiki/tasks/install.yml explanation --- roles/mediawiki/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 006381b72..a260c0e04 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -83,7 +83,7 @@ - name: Install /etc/{{ apache_conf_dir }}/mediawiki.conf from template, for http://box{{ mediawiki_url }} via Apache template: src: mediawiki.conf.j2 - dest: "/etc/{{ apache_conf_dir }}/mediawiki.conf" # apache2/sites-availableon debuntu + dest: "/etc/{{ apache_conf_dir }}/mediawiki.conf" # apache2/sites-available on debuntu # RECORD MediaWiki AS INSTALLED From 810fc81ac858a554a59acba42505aa92fabda1e1 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Feb 2020 19:54:04 -0500 Subject: [PATCH 3/6] Convert dest: to path: per Ansible lineinfile norms --- roles/1-prep/tasks/main.yml | 2 +- roles/2-common/tasks/main.yml | 2 +- roles/3-base-server/tasks/main.yml | 2 +- roles/4-server-options/tasks/main.yml | 2 +- roles/5-xo-services/tasks/main.yml | 2 +- roles/6-generic-apps/tasks/main.yml | 2 +- roles/7-edu-apps/tasks/main.yml | 2 +- roles/8-mgmt-tools/tasks/main.yml | 2 +- roles/9-local-addons/tasks/main.yml | 2 +- roles/awstats/tasks/install.yml | 2 +- roles/azuracast/tasks/install.yml | 2 +- roles/bluetooth/tasks/install.yml | 2 +- roles/calibre-web/tasks/install.yml | 2 +- roles/calibre/tasks/install.yml | 2 +- roles/captiveportal/tasks/install.yml | 2 +- roles/cups/tasks/main.yml | 2 +- roles/elgg/tasks/install.yml | 2 +- roles/gitea/tasks/install.yml | 2 +- roles/httpd/tasks/install.yml | 2 +- roles/internetarchive/tasks/install.yml | 2 +- roles/kalite/tasks/setup.yml | 2 +- roles/kiwix/tasks/install.yml | 2 +- roles/kolibri/tasks/install.yml | 2 +- roles/lokole/tasks/install.yml | 2 +- roles/mediawiki/tasks/install.yml | 2 +- roles/minetest/tasks/provision.yml | 2 +- roles/mongodb/tasks/install.yml | 2 +- roles/monit/tasks/install.yml | 2 +- roles/moodle/tasks/install.yml | 2 +- roles/mosquitto/tasks/install.yml | 2 +- roles/munin/tasks/install.yml | 2 +- roles/mysql/tasks/main.yml | 2 +- roles/network/tasks/computed_network.yml | 4 ++-- roles/network/tasks/dansguardian.yml | 2 +- roles/network/tasks/dhcpd.yml | 2 +- roles/network/tasks/enable_services.yml | 2 +- roles/network/tasks/hostapd.yml | 2 +- roles/network/tasks/named.yml | 2 +- roles/network/tasks/squid.yml | 2 +- roles/network/tasks/wondershaper.yml | 2 +- roles/nextcloud/tasks/install.yml | 2 +- roles/nginx/tasks/install.yml | 2 +- roles/nodejs/tasks/main.yml | 2 +- roles/nodered/tasks/install.yml | 2 +- roles/openvpn/tasks/main.yml | 2 +- roles/osm-vector-maps/tasks/install.yml | 2 +- roles/pbx/tasks/main.yml | 2 +- roles/phpmyadmin/tasks/main.yml | 2 +- roles/postgresql/tasks/main.yml | 2 +- roles/samba/tasks/main.yml | 2 +- roles/sshd/tasks/main.yml | 2 +- roles/sugarizer/tasks/install.yml | 2 +- roles/transmission/tasks/main.yml | 2 +- roles/usb_lib/tasks/main.yml | 2 +- roles/vnstat/tasks/main.yml | 2 +- roles/wordpress/tasks/install.yml | 2 +- roles/yarn/tasks/main.yml | 2 +- 57 files changed, 58 insertions(+), 58 deletions(-) diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml index 97dd3fa26..2726f4176 100644 --- a/roles/1-prep/tasks/main.yml +++ b/roles/1-prep/tasks/main.yml @@ -135,4 +135,4 @@ - name: Recording STAGE 1 HAS COMPLETED ============================ template: src: roles/1-prep/templates/iiab.env.j2 - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml index 9e736a9bb..9ebf80444 100644 --- a/roles/2-common/tasks/main.yml +++ b/roles/2-common/tasks/main.yml @@ -52,6 +52,6 @@ - name: Recording STAGE 2 HAS COMPLETED ========================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=2' diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index fbe60024c..3575e9645 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -23,6 +23,6 @@ - name: Recording STAGE 3 HAS COMPLETED ===================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=3' diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index e0eb29a66..9f94cde9e 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -50,6 +50,6 @@ - name: Recording STAGE 4 HAS COMPLETED ================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=4' diff --git a/roles/5-xo-services/tasks/main.yml b/roles/5-xo-services/tasks/main.yml index 94cc58597..40f9d2d6e 100644 --- a/roles/5-xo-services/tasks/main.yml +++ b/roles/5-xo-services/tasks/main.yml @@ -23,6 +23,6 @@ - name: Recording STAGE 5 HAS COMPLETED ===================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=5' diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index f0a617954..25fe4602c 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -67,6 +67,6 @@ - name: Recording STAGE 6 HAS COMPLETED ==================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=6' diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 5acad13f3..c181e7924 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -47,6 +47,6 @@ - name: Recording STAGE 7 HAS COMPLETED ======================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=7' diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml index 896c900ef..c882eb632 100644 --- a/roles/8-mgmt-tools/tasks/main.yml +++ b/roles/8-mgmt-tools/tasks/main.yml @@ -35,6 +35,6 @@ - name: Recording STAGE 8 HAS COMPLETED ====================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=8' diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index 8d1ba1744..7a9448a71 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -51,6 +51,6 @@ - name: Recording STAGE 9 HAS COMPLETED ==================== lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^STAGE=*' line: 'STAGE=9' diff --git a/roles/awstats/tasks/install.yml b/roles/awstats/tasks/install.yml index de191701c..a66324784 100644 --- a/roles/awstats/tasks/install.yml +++ b/roles/awstats/tasks/install.yml @@ -109,6 +109,6 @@ - name: "Add 'awstats_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^awstats_installed' line: 'awstats_installed: True' diff --git a/roles/azuracast/tasks/install.yml b/roles/azuracast/tasks/install.yml index e927173cf..7a19c6a14 100644 --- a/roles/azuracast/tasks/install.yml +++ b/roles/azuracast/tasks/install.yml @@ -73,6 +73,6 @@ - name: "Add 'azuracast_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^azuracast_installed' line: 'azuracast_installed: True' diff --git a/roles/bluetooth/tasks/install.yml b/roles/bluetooth/tasks/install.yml index 5872ec99b..be7378b13 100644 --- a/roles/bluetooth/tasks/install.yml +++ b/roles/bluetooth/tasks/install.yml @@ -64,6 +64,6 @@ - name: "Add 'bluetooth_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^bluetooth_installed' line: 'bluetooth_installed: True' diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index 6b98dd2b3..330ebe56b 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -109,6 +109,6 @@ - name: "Add 'calibreweb_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^calibreweb_installed' line: 'calibreweb_installed: True' diff --git a/roles/calibre/tasks/install.yml b/roles/calibre/tasks/install.yml index 1f2fc58bb..4144d58a5 100644 --- a/roles/calibre/tasks/install.yml +++ b/roles/calibre/tasks/install.yml @@ -93,6 +93,6 @@ - name: "Add 'calibre_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^calibre_installed' line: 'calibre_installed: True' diff --git a/roles/captiveportal/tasks/install.yml b/roles/captiveportal/tasks/install.yml index 5ef5406ec..40c50f146 100644 --- a/roles/captiveportal/tasks/install.yml +++ b/roles/captiveportal/tasks/install.yml @@ -61,6 +61,6 @@ - name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^captiveportal_installed' line: 'captiveportal_installed: True' diff --git a/roles/cups/tasks/main.yml b/roles/cups/tasks/main.yml index d0a52f7ff..72ffec896 100644 --- a/roles/cups/tasks/main.yml +++ b/roles/cups/tasks/main.yml @@ -31,7 +31,7 @@ - name: "Add 'cups_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^cups_installed' line: 'cups_installed: True' diff --git a/roles/elgg/tasks/install.yml b/roles/elgg/tasks/install.yml index 484c9ab78..244da7b90 100644 --- a/roles/elgg/tasks/install.yml +++ b/roles/elgg/tasks/install.yml @@ -96,6 +96,6 @@ - name: "Add 'elgg_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^elgg_installed' line: 'elgg_installed: True' diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml index 7ccb3350c..b919608bf 100644 --- a/roles/gitea/tasks/install.yml +++ b/roles/gitea/tasks/install.yml @@ -114,6 +114,6 @@ - name: "Add 'gitea_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^gitea_installed' line: 'gitea_installed: True' diff --git a/roles/httpd/tasks/install.yml b/roles/httpd/tasks/install.yml index 8dfaf8b88..03fb3cdf7 100644 --- a/roles/httpd/tasks/install.yml +++ b/roles/httpd/tasks/install.yml @@ -149,6 +149,6 @@ - name: "Add 'apache_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^apache_installed' line: 'apache_installed: True' diff --git a/roles/internetarchive/tasks/install.yml b/roles/internetarchive/tasks/install.yml index c7289edd6..9d80ce71d 100644 --- a/roles/internetarchive/tasks/install.yml +++ b/roles/internetarchive/tasks/install.yml @@ -67,6 +67,6 @@ - name: "Add 'internetarchive_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^internetarchive_installed' line: 'internetarchive_installed: True' diff --git a/roles/kalite/tasks/setup.yml b/roles/kalite/tasks/setup.yml index 495ee6b3c..7884e6be2 100644 --- a/roles/kalite/tasks/setup.yml +++ b/roles/kalite/tasks/setup.yml @@ -27,6 +27,6 @@ - name: "Add 'kalite_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^kalite_installed' line: 'kalite_installed: True' diff --git a/roles/kiwix/tasks/install.yml b/roles/kiwix/tasks/install.yml index b047f65b1..0e8235d86 100644 --- a/roles/kiwix/tasks/install.yml +++ b/roles/kiwix/tasks/install.yml @@ -93,6 +93,6 @@ - name: "Add 'kiwix_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^kiwix_installed' line: 'kiwix_installed: True' diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index 83a9aec3e..7dbc7e2de 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -121,6 +121,6 @@ - name: "Add 'kolibri_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^kolibri_installed' line: 'kolibri_installed: True' diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index 76099bde1..fa8c7051e 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -100,6 +100,6 @@ - name: "Add 'lokole_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^lokole_installed' line: 'lokole_installed: True' diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 3b8151a1b..587441ff2 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -94,6 +94,6 @@ - name: "Add 'mediawiki_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^mediawiki_installed' line: 'mediawiki_installed: True' diff --git a/roles/minetest/tasks/provision.yml b/roles/minetest/tasks/provision.yml index 74de12d15..5d932d31a 100644 --- a/roles/minetest/tasks/provision.yml +++ b/roles/minetest/tasks/provision.yml @@ -78,6 +78,6 @@ - name: "Add 'minetest_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^minetest_installed' line: 'minetest_installed: True' diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml index 08e8c6a21..0ecb52bc0 100644 --- a/roles/mongodb/tasks/install.yml +++ b/roles/mongodb/tasks/install.yml @@ -135,6 +135,6 @@ - name: "Add 'mongodb_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^mongodb_installed' line: 'mongodb_installed: True' diff --git a/roles/monit/tasks/install.yml b/roles/monit/tasks/install.yml index 7e16ada96..96addc26e 100644 --- a/roles/monit/tasks/install.yml +++ b/roles/monit/tasks/install.yml @@ -63,6 +63,6 @@ - name: "Add 'monit_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^monit_installed' line: 'monit_installed: True' diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 4283312c0..7057d2d13 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -163,6 +163,6 @@ - name: "Add 'moodle_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^moodle_installed' line: 'moodle_installed: True' diff --git a/roles/mosquitto/tasks/install.yml b/roles/mosquitto/tasks/install.yml index 695a8d9f2..1df4b78f4 100644 --- a/roles/mosquitto/tasks/install.yml +++ b/roles/mosquitto/tasks/install.yml @@ -38,6 +38,6 @@ - name: "Add 'mosquitto_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^mosquitto_installed' line: 'mosquitto_installed: True' diff --git a/roles/munin/tasks/install.yml b/roles/munin/tasks/install.yml index f42daa35e..56a0f4386 100644 --- a/roles/munin/tasks/install.yml +++ b/roles/munin/tasks/install.yml @@ -57,6 +57,6 @@ - name: "Add 'munin_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^munin_installed' line: 'munin_installed: True' diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index b62ff931b..bf1a2dccc 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -123,7 +123,7 @@ - name: "Add 'mysql_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^mysql_installed' line: 'mysql_installed: True' diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml index 5e78b7714..15e275d9d 100644 --- a/roles/network/tasks/computed_network.yml +++ b/roles/network/tasks/computed_network.yml @@ -174,14 +174,14 @@ - name: Record IIAB_WAN_DEVICE to {{ iiab_env_file }} lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^IIAB_WAN_DEVICE=*' line: 'IIAB_WAN_DEVICE="{{ iiab_wan_iface }}"' when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml - name: Record IIAB_LAN_DEVICE to {{ iiab_env_file }} lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^IIAB_LAN_DEVICE=*' line: 'IIAB_LAN_DEVICE="{{ iiab_lan_iface }}"' state: present diff --git a/roles/network/tasks/dansguardian.yml b/roles/network/tasks/dansguardian.yml index fba41efe9..619644bcf 100644 --- a/roles/network/tasks/dansguardian.yml +++ b/roles/network/tasks/dansguardian.yml @@ -50,6 +50,6 @@ - name: "Add 'dansguardian_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^dansguardian_installed' line: 'dansguardian_installed: True' diff --git a/roles/network/tasks/dhcpd.yml b/roles/network/tasks/dhcpd.yml index 054db6ee5..5a066eba2 100644 --- a/roles/network/tasks/dhcpd.yml +++ b/roles/network/tasks/dhcpd.yml @@ -56,6 +56,6 @@ - name: "Add 'dhcpd_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^dhcpd_installed' line: 'dhcpd_installed: True' diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 28b399df0..76b4602da 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -174,7 +174,7 @@ - name: Revert to 'HTTPCACHE_ON=False' if not squid_enabled lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^HTTPCACHE_ON=*' line: 'HTTPCACHE_ON=False' state: present diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml index a99632867..7c14c190f 100644 --- a/roles/network/tasks/hostapd.yml +++ b/roles/network/tasks/hostapd.yml @@ -63,7 +63,7 @@ - name: Record HOSTAPD_ENABLED to {{ iiab_env_file }} lineinfile: - dest: "{{ iiab_env_file }}" + path: "{{ iiab_env_file }}" regexp: '^HOSTAPD_ENABLED=*' line: 'HOSTAPD_ENABLED={{ hostapd_enabled }}' state: present diff --git a/roles/network/tasks/named.yml b/roles/network/tasks/named.yml index f967f5c4a..2111f15aa 100644 --- a/roles/network/tasks/named.yml +++ b/roles/network/tasks/named.yml @@ -79,7 +79,7 @@ - name: "Add 'named_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^named_installed' line: 'named_installed: True' diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml index 55f8ad0a9..8bde37ba7 100644 --- a/roles/network/tasks/squid.yml +++ b/roles/network/tasks/squid.yml @@ -82,7 +82,7 @@ - name: "Add 'squid_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^squid_installed' line: 'squid_installed: True' diff --git a/roles/network/tasks/wondershaper.yml b/roles/network/tasks/wondershaper.yml index d55481471..ce96c79b7 100644 --- a/roles/network/tasks/wondershaper.yml +++ b/roles/network/tasks/wondershaper.yml @@ -40,7 +40,7 @@ - name: "Add 'wondershaper_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^wondershaper_installed' line: 'wondershaper_installed: True' diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml index 1ccbc4ad7..cf1d233a5 100644 --- a/roles/nextcloud/tasks/install.yml +++ b/roles/nextcloud/tasks/install.yml @@ -188,6 +188,6 @@ - name: "Add 'nextcloud_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^nextcloud_installed' line: 'nextcloud_installed: True' diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index ad21ac29d..fcc04db91 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -52,6 +52,6 @@ - name: "Add 'nginx_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^nginx_installed' line: 'nginx_installed: True' diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml index e47ba1cf0..cda9eea7d 100644 --- a/roles/nodejs/tasks/main.yml +++ b/roles/nodejs/tasks/main.yml @@ -159,6 +159,6 @@ - name: "Add 'nodejs_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^nodejs_installed' line: 'nodejs_installed: True' diff --git a/roles/nodered/tasks/install.yml b/roles/nodered/tasks/install.yml index 80551feac..e04aa57c2 100644 --- a/roles/nodered/tasks/install.yml +++ b/roles/nodered/tasks/install.yml @@ -130,6 +130,6 @@ - name: "Add 'nodered_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^nodered_installed' line: 'nodered_installed: True' diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 10651af47..c0273eb83 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -116,7 +116,7 @@ - name: "Add 'openvpn_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^openvpn_installed' line: 'openvpn_installed: True' diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index e4e17d099..849c42017 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -75,6 +75,6 @@ - name: "Add 'osm_vector_maps_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^osm_vector_maps_installed' line: 'osm_vector_maps_installed: True' diff --git a/roles/pbx/tasks/main.yml b/roles/pbx/tasks/main.yml index bdcc26c51..7d88920c6 100644 --- a/roles/pbx/tasks/main.yml +++ b/roles/pbx/tasks/main.yml @@ -76,6 +76,6 @@ - name: "Add 'pbx_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^pbx_installed' line: 'pbx_installed: True' diff --git a/roles/phpmyadmin/tasks/main.yml b/roles/phpmyadmin/tasks/main.yml index 088fd4e2e..bfc8587d7 100644 --- a/roles/phpmyadmin/tasks/main.yml +++ b/roles/phpmyadmin/tasks/main.yml @@ -60,7 +60,7 @@ - name: "Add 'phpmyadmin_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^phpmyadmin_installed' line: 'phpmyadmin_installed: True' diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml index 50a4bbc3e..fca62888a 100644 --- a/roles/postgresql/tasks/main.yml +++ b/roles/postgresql/tasks/main.yml @@ -94,7 +94,7 @@ - name: "Add 'postgresql_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^postgresql_installed' line: 'postgresql_installed: True' diff --git a/roles/samba/tasks/main.yml b/roles/samba/tasks/main.yml index 17e80938f..613db11e2 100755 --- a/roles/samba/tasks/main.yml +++ b/roles/samba/tasks/main.yml @@ -36,7 +36,7 @@ - name: "Add 'samba_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^samba_installed' line: 'samba_installed: True' diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml index ac96f0208..67c8b1478 100644 --- a/roles/sshd/tasks/main.yml +++ b/roles/sshd/tasks/main.yml @@ -40,7 +40,7 @@ - name: "Add 'sshd_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^sshd_installed' line: 'sshd_installed: True' diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml index 90e6ad1fb..1f8eacb3a 100644 --- a/roles/sugarizer/tasks/install.yml +++ b/roles/sugarizer/tasks/install.yml @@ -278,6 +278,6 @@ - name: "Add 'sugarizer_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^sugarizer_installed' line: 'sugarizer_installed: True' diff --git a/roles/transmission/tasks/main.yml b/roles/transmission/tasks/main.yml index 340f3d95b..2abc6efe5 100644 --- a/roles/transmission/tasks/main.yml +++ b/roles/transmission/tasks/main.yml @@ -36,7 +36,7 @@ - name: "Add 'transmission_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^transmission_installed' line: 'transmission_installed: True' diff --git a/roles/usb_lib/tasks/main.yml b/roles/usb_lib/tasks/main.yml index 82ecc6724..ff6a179c1 100644 --- a/roles/usb_lib/tasks/main.yml +++ b/roles/usb_lib/tasks/main.yml @@ -44,7 +44,7 @@ - name: "Add 'usb_lib_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^usb_lib_installed' line: 'usb_lib_installed: True' diff --git a/roles/vnstat/tasks/main.yml b/roles/vnstat/tasks/main.yml index ad33cc15e..f1c793fe0 100644 --- a/roles/vnstat/tasks/main.yml +++ b/roles/vnstat/tasks/main.yml @@ -27,7 +27,7 @@ - name: "Add 'vnstat_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^vnstat_installed' line: 'vnstat_installed: True' diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml index 29a8bc216..5580e9696 100644 --- a/roles/wordpress/tasks/install.yml +++ b/roles/wordpress/tasks/install.yml @@ -100,6 +100,6 @@ - name: "Add 'wordpress_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^wordpress_installed' line: 'wordpress_installed: True' diff --git a/roles/yarn/tasks/main.yml b/roles/yarn/tasks/main.yml index 533a5315a..178f8e429 100644 --- a/roles/yarn/tasks/main.yml +++ b/roles/yarn/tasks/main.yml @@ -36,6 +36,6 @@ - name: "Add 'yarn_installed: True' to {{ iiab_state_file }}" lineinfile: - dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml regexp: '^yarn_installed' line: 'yarn_installed: True' From 4b74daa95c0c40f76d0caa70b94cf0edfe4a26d5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Feb 2020 19:59:46 -0500 Subject: [PATCH 4/6] Fix roles/1-prep/tasks/main.yml --- roles/1-prep/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml index 2726f4176..97dd3fa26 100644 --- a/roles/1-prep/tasks/main.yml +++ b/roles/1-prep/tasks/main.yml @@ -135,4 +135,4 @@ - name: Recording STAGE 1 HAS COMPLETED ============================ template: src: roles/1-prep/templates/iiab.env.j2 - path: "{{ iiab_env_file }}" + dest: "{{ iiab_env_file }}" From a5b7f7bb75c0838829abecfecd3173bd3803c056 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Tue, 4 Feb 2020 10:42:00 -0500 Subject: [PATCH 5/6] softcode and increase proxy timeouts for kiwix in nginx --- roles/kiwix/defaults/main.yml | 1 + roles/kiwix/templates/kiwix-nginx.conf | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 992d94c5a..f3aebfb36 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -38,3 +38,4 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml" # - NEW WAY: cd /opt/iiab/iiab; ./runrole --reinstall kiwix # - OLD WAY: rm /opt/iiab/kiwix/bin/kiwix-serve; cd /opt/iiab/iiab; ./runrole kiwix kiwix_force_install: False +kiwix_nginx_timeout: 600 diff --git a/roles/kiwix/templates/kiwix-nginx.conf b/roles/kiwix/templates/kiwix-nginx.conf index c14b82f1a..2c5f96f80 100644 --- a/roles/kiwix/templates/kiwix-nginx.conf +++ b/roles/kiwix/templates/kiwix-nginx.conf @@ -1,3 +1,12 @@ location /kiwix { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $http_host; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_connect_timeout {{ kiwix_nginx_timeout }}; + proxy_send_timeout {{ kiwix_nginx_timeout }}; + proxy_read_timeout {{ kiwix_nginx_timeout }}; + send_timeout {{ kiwix_nginx_timeout }}; proxy_pass http://127.0.0.1:3000; + } From 27c948c5dae119556ba6bcd15d5627b890ecb8a2 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Tue, 4 Feb 2020 11:12:07 -0500 Subject: [PATCH 6/6] add softcoded threads while we're at it --- roles/kiwix/defaults/main.yml | 1 + roles/kiwix/templates/kiwix-serve.service.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index f3aebfb36..0801516e0 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -39,3 +39,4 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml" # - OLD WAY: rm /opt/iiab/kiwix/bin/kiwix-serve; cd /opt/iiab/iiab; ./runrole kiwix kiwix_force_install: False kiwix_nginx_timeout: 600 +kiwix_threads: 4 diff --git a/roles/kiwix/templates/kiwix-serve.service.j2 b/roles/kiwix/templates/kiwix-serve.service.j2 index 14dc96bc8..30157bbac 100644 --- a/roles/kiwix/templates/kiwix-serve.service.j2 +++ b/roles/kiwix/templates/kiwix-serve.service.j2 @@ -4,7 +4,7 @@ After=syslog.target network.target local-fs.target [Service] Type=forking -ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }} +ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }} --threads {{ kiwix_threads }} TimeoutStartSec=180 Restart=on-abort RestartSec=5s