1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Remove "| bool" 1.5yrs later, as Ansible 2.10 changed conditional_bare_variables default

This commit is contained in:
root 2020-10-16 16:46:19 -04:00
parent 2968a8a20e
commit ca171fbc1c
158 changed files with 2072 additions and 2072 deletions

View file

@ -10,7 +10,7 @@
- name: "IN CASE NGINX IS DISABLED: Enable IIAB pages via Apache (e.g. on port 80) by running 'a2ensite iiab-homepage.conf'"
command: a2ensite iiab-homepage.conf
#when: apache_enabled | bool
#when: apache_enabled
# - name: Disable IIAB pages via Apache (e.g. on port 80) by running 'a2dissite iiab-homepage.conf', if not apache_enabled"
# command: a2dissite iiab-homepage.conf

View file

@ -8,8 +8,8 @@
# - "php{{ php_version }}"
# - "php{{ php_version }}-curl"
state: present
when: is_debuntu | bool
# when: is_debian | bool
when: is_debuntu
# when: is_debian
# - name: 'Install 2 packages: apache2, php (ubuntu)'
# package:
@ -19,7 +19,7 @@
# - "{{ apache_service }}" # apache2 on Debuntu
# - php
# state: present
# when: is_ubuntu | bool
# when: is_ubuntu
# 2019-05-30: It's interesting that http://box.lan/admin and everything seems
# to work even without php{{ php_version }}-sqlite3 as confirmed on Ubuntu
@ -49,7 +49,7 @@
- php
- php-curl
state: present
when: is_redhat | bool
when: is_redhat
# Remove symlinks for mpm_event, replace with mpm_prefork
- name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled (debuntu)
@ -59,7 +59,7 @@
with_items:
- mpm_event.conf
- mpm_event.load
when: is_debuntu | bool
when: is_debuntu
- name: Create both mpm_prefork symlinks from /etc/apache2/mods-enabled to /etc/apache2/mods-available (debuntu)
file:
@ -69,7 +69,7 @@
with_items:
- mpm_prefork.conf
- mpm_prefork.load
when: is_debuntu | bool
when: is_debuntu
- name: 'Enable 5 Apache modules, as with "a2enmod" command: headers, proxy, proxy_html, proxy_http, rewrite (for http://box/kiwix, http://box/kolibri, http://box/nodered, etc--if debuntu)'
apache2_module:
@ -80,7 +80,7 @@
- proxy_html
- proxy_http
- rewrite
when: is_debuntu | bool
when: is_debuntu
- name: Remove 000-default.conf from /etc/apache2 and /etc/apache2/sites-enabled (debuntu)
file:
@ -89,7 +89,7 @@
with_items:
- /etc/apache2/000-default.conf # Not nec on Raspbian. Is this really still needed elsewhere?
- /etc/apache2/sites-enabled/000-default.conf
when: is_debuntu | bool
when: is_debuntu
- name: Create Apache's pid dir /var/run/{{ apache_user }}
file:
@ -128,7 +128,7 @@
- name: "IN CASE NGINX IS DISABLED: Enable IIAB pages via Apache (e.g. on port 80) by running 'a2ensite 010-iiab.conf'"
command: a2ensite 010-iiab.conf
#when: apache_enabled | bool
#when: apache_enabled
# - name: Disable IIAB pages via Apache (e.g. on port 80) by running 'a2dissite 010-iiab.conf', if not apache_enabled"
# command: a2dissite 010-iiab.conf

View file

@ -36,7 +36,7 @@
name: "{{ apache_service }}"
enabled: yes
state: started # No need to restart, as many IIAB apps do that later
when: apache_enabled | bool
when: apache_enabled
- name: Disable & Stop {{ apache_service }} systemd service, if not apache_enabled
systemd: