Update main.yml

roles/httpd/tasks/main.yml

@@ -6,7 +6,7 @@
     - apache2
     - php{{ php_version }}
     - php{{ php_version }}-curl
-#    - php{{ php_version }}-sqlite
+    #- php{{ php_version }}-sqlite
   tags:
     - download
   when: is_debian
@@ -65,10 +65,10 @@
     dest: "{{ item.dest }}"
     owner: root
     group: root
-    mode: "{{ item.mode }}"
+    mode: 0644
   with_items:
-    - { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0644' }
+    - { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf' }
-    - { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' }
+    - { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf' }
     #- { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' }    # @jvonau suggests removing this in https://github.com/iiab/iiab/issues/1147
 
 # For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147
@@ -87,7 +87,7 @@
     - { regexp: '^max_input_time', line: 'max_input_time = 300    ; default is 60' }
 
 # remove symlinks for mpm-event, replace with mpm-prefork
-- name: Remove mpm event links (debuntu)
+- name: Remove mpm event symlinks (debuntu)
   file:
     path: "/etc/apache2/mods-enabled/{{ item }}"
     state: absent
@@ -98,8 +98,8 @@
 
 - name: Create symlinks for mpm-prefork (debuntu)
   file:
-    path: "/etc/apache2/mods-enabled/{{ item }}"
     src: "/etc/apache2/mods-available/{{ item }}"
+    path: "/etc/apache2/mods-enabled/{{ item }}"
     state: link
   with_items:
     - mpm_prefork.conf
@@ -115,13 +115,11 @@
     - rewrite
   when: is_debuntu
 
-- name: Create symlinks for enabling our site (debuntu)
+- name: Create 010-iiab.conf symlink enabling our site (debuntu)
   file:
-    path: "/etc/apache2/sites-enabled/{{ item }}"
+    src: "/etc/{{ apache_config_dir }}/010-iiab.conf"
-    src: "/etc/apache2/sites-available/{{ item }}"
+    path: /etc/apache2/sites-enabled/010-iiab.conf
     state: link
-  with_items:
-    - 010-iiab.conf
   when: is_debuntu
 
 - name: Remove apache2 default config files (debuntu)
@@ -166,7 +164,7 @@
     name: "{{ apache_service }}"
     enabled: yes
 
-- name: Create iiab-info directory
+- name: Create /library/www/html/info directory for http://box/info offline docs
   file:
     path: "{{ doc_root }}/info"
     mode: 0755
@@ -174,16 +172,20 @@
     group: "{{ apache_user }}"
     state: directory
 
-- name: Remove iiab-info.conf
+# roles/httpd/templates/iiab-info.conf.j2.deprecated is no longer needed, as
-  file:
+# Apache serves http://box/info directly from above /library/www/html/info
-    dest: "/etc/{{ apache_config_dir }}/iiab-info.conf"
+# directly (as generated by /usr/bin/iiab-refresh-wiki-docs)
-    state: absent
+#
-
+#- name: Remove iiab-info.conf
-- name: Remove iiab-info.conf symlink (debuntu)
+#  file:
-  file:
+#    path: "/etc/{{ apache_config_dir }}/iiab-info.conf"
-    dest: /etc/apache2/sites-enabled/iiab-info.conf
+#    state: absent
-    state: absent
+#
-  when: is_debuntu
+#- name: Remove iiab-info.conf symlink (debuntu)
+#  file:
+#    path: /etc/apache2/sites-enabled/iiab-info.conf
+#    state: absent
+#  when: is_debuntu
 
 # SEE https://github.com/iiab/iiab/issues/1143 as the old roles/osm playbook is rarely used as of late 2018 (if anybody still uses roles/osm, they can overwrite osm.conf using the original osm playbook, or in other ways)
 - name: Copy osm.conf for http://box/maps (all OS's)
@@ -195,10 +197,11 @@
     mode: 0644
     backup: yes
 
-- name: Create link from sites-enabled to sites-available (debuntu)
+- name: Create osm.conf symlink from sites-enabled to sites-available (debuntu)
   file:
     src: "/etc/{{ apache_config_dir }}/osm.conf"
-    dest: /etc/apache2/sites-enabled/osm.conf
+    path: /etc/apache2/sites-enabled/osm.conf
+    #path: "/etc/{{ apache_service }}/sites-enabled/osm.conf"
     state: link
   when: is_debuntu
 
@@ -226,6 +229,6 @@
 
 - name: Remove apache_user permission to poweroff
   file:
-    dest: /etc/sudoers.d/020_apache_poweroff
+    path: /etc/sudoers.d/020_apache_poweroff
     state: absent
   when: not apache_allow_sudo