diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 9e002477a..468a940fa 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -54,7 +54,7 @@ - "{{ doc_root }}/common/html" - "{{ doc_root }}/common/images" - "{{ doc_root }}/common/assets" - - "{{ doc_root }}/common/menu-defs" + - "{{ doc_root }}/common/services" - name: Create olpc-scripts directory file: path={{ item }} diff --git a/roles/httpd/files/html/services/power_off.php b/roles/httpd/files/html/services/power_off.php new file mode 100644 index 000000000..49a566b86 --- /dev/null +++ b/roles/httpd/files/html/services/power_off.php @@ -0,0 +1,5 @@ + diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index de9cef54a..ae6892ff8 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -3,13 +3,21 @@ state=present with_items: - apache2 - - php5 - - php5-curl - - php5-sqlite + - php{{ php_version }} + - php{{ php_version }}-curl +# - php{{ php_version }}-sqlite tags: - download when: is_debian +- name: Debian changed sqlite name + package: name=php{{ php_version }}-sqlite + when: is_debian and ansible_distribution_major_version == "8" + +- name: Debian changed sqlite name + package: name=php{{ php_version }}-sqlite3 + when: ansible_local.local_facts.os_ver == "debian-9" + - name: Install httpd required packages package: name={{ item }} state=present @@ -139,7 +147,7 @@ - base - include: home-page.yml - + - name: place the script to generate home pages template: src=refresh-wiki-docs.sh dest=/usr/bin/iiab-refresh-wiki-docs @@ -147,5 +155,15 @@ - name: generate the offline documents command: /usr/bin/iiab-refresh-wiki-docs + when: not nodocs +- name: Give apache_user permission for poweroff + template: src=020_apache_poweroff.j2 + dest=/etc/sudoers.d/020_apache_poweroff + mode=0755 + when: allow_apache_sudo +- name: Remove apache_user permission for poweroff + file: dest=/etc/sudoers.d/020_apache_poweroff + state=absent + when: not allow_apache_sudo diff --git a/roles/httpd/templates/020_apache_poweroff.j2 b/roles/httpd/templates/020_apache_poweroff.j2 new file mode 100644 index 000000000..bf4e0093c --- /dev/null +++ b/roles/httpd/templates/020_apache_poweroff.j2 @@ -0,0 +1 @@ +{{ apache_user }} ALL =NOPASSWD: /sbin/poweroff, /bin/systemctl poweroff diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 067e35d0c..26ed484ed 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -88,6 +88,9 @@ wan_nameserver: # 3-BASE +# apache +allow_apache_sudo: False + # dhcpd dhcpd_install: True dhcpd_enabled: False @@ -169,7 +172,7 @@ ejabberd_enabled: False # idmgr and activity-server idmgr_install: True -activity-server_install: True +activity_server_install: False xo_services_enabled: False # 6-GENERIC-APPS