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

Merge pull request #1016 from holta/httpd-cleanup

httpd playbook output clarified
This commit is contained in:
A Holt 2018-08-21 08:51:29 -04:00 committed by GitHub
commit 7d90eccdd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 27 deletions

View file

@ -1,4 +1,4 @@
- name: Copy css files - name: Copy css files to /library/www/html/common/css
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/common/css" dest: "{{ doc_root }}/common/css"
@ -8,7 +8,7 @@
with_fileglob: with_fileglob:
- html/css/*.css - html/css/*.css
- name: Copy js files - name: Copy js files to /library/www/html/common/js
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/common/js" dest: "{{ doc_root }}/common/js"
@ -18,7 +18,7 @@
with_fileglob: with_fileglob:
- html/js/*.js - html/js/*.js
- name: Copy fonts files - name: Copy fonts files to /library/www/html/common/fonts
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/common/fonts" dest: "{{ doc_root }}/common/fonts"
@ -28,7 +28,7 @@
with_fileglob: with_fileglob:
- html/fonts/* - html/fonts/*
- name: Copy html files - name: Copy html files to /library/www/html/common/html
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/common/html" dest: "{{ doc_root }}/common/html"
@ -38,7 +38,7 @@
with_fileglob: with_fileglob:
- html/html/* - html/html/*
- name: Copy assets files - name: Copy assets files to /library/www/html/common/assets
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/common/assets" dest: "{{ doc_root }}/common/assets"
@ -49,7 +49,7 @@
- html/assets/* - html/assets/*
# copy all services, even if not permissioned elsewhere # copy all services, even if not permissioned elsewhere
- name: Copy services files - name: Copy services files to /library/www/html/common/services
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/common/services" dest: "{{ doc_root }}/common/services"
@ -59,7 +59,7 @@
with_fileglob: with_fileglob:
- html/services/* - html/services/*
- name: Create symlink from assets to iiab.ini - name: Create symlink from assets to /etc/iiab/iiab.ini
file: file:
src: "/etc/iiab/iiab.ini" src: "/etc/iiab/iiab.ini"
dest: "{{ doc_root }}/common/assets/iiab.ini" dest: "{{ doc_root }}/common/assets/iiab.ini"

View file

@ -11,13 +11,14 @@
- download - download
when: is_debian when: is_debian
- name: Debian changed sqlite name (debian-8) - name: Debian changed SQLite name (debian-8)
package: package:
name: "php{{ php_version }}-sqlite" name: "php{{ php_version }}-sqlite"
when: is_debian and ansible_distribution_major_version == "8" when: is_debian and ansible_distribution_major_version == "8"
- name: Debian changed sqlite name (debian-9) - name: Debian changed SQLite3 name (debian-9)
package: name=php{{ php_version }}-sqlite3 package:
name: "php{{ php_version }}-sqlite3"
when: is_debian and ansible_distribution_major_version == "9" when: is_debian and ansible_distribution_major_version == "9"
- name: Install httpd required packages (ubuntu) - name: Install httpd required packages (ubuntu)
@ -31,7 +32,7 @@
- download - download
when: is_ubuntu when: is_ubuntu
- name: Sqlite3 no longer included in another package in ubuntu18 - name: SQLite3 no longer included in another package (ubuntu-18)
package: package:
name: php{{ php_version }}-sqlite3 name: php{{ php_version }}-sqlite3
when: is_ubuntu_18 when: is_ubuntu_18
@ -50,11 +51,12 @@
- download - download
when: is_redhat when: is_redhat
- name: Remove the default apache2 config file (debuntu) # MOVED DOWN ~58 LINES
file: #- name: Remove the default apache2 config file (debuntu)
path: /etc/apache2/sites-enabled/000-default.conf # file:
state: absent # path: /etc/apache2/sites-enabled/000-default.conf
when: is_debuntu # state: absent
# when: is_debuntu
- name: Create httpd config files - name: Create httpd config files
template: template:
@ -65,9 +67,9 @@
group: root group: root
mode: "{{ item.mode }}" mode: "{{ item.mode }}"
with_items: with_items:
- { src: '010-iiab.conf.j2' , dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' } - { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' }
- { 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', mode: '0644' }
- { src: 'php.ini.j2' , dest: '/etc/php.ini' , mode: '0644' } - { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' }
# remove symlinks for mpm-event, replace with mpm-prefork # remove symlinks for mpm-event, replace with mpm-prefork
- name: Remove mpm event links (debuntu) - name: Remove mpm event links (debuntu)
@ -100,20 +102,23 @@
- name: Create symlinks for enabling our site (debuntu) - name: Create symlinks for enabling our site (debuntu)
file: file:
path: "/etc/apache2/sites-enabled/{{ item }}" path: "/etc/apache2/sites-enabled/{{ item }}" # Not nec on Raspbian. Is this really still needed elsewhere?
src: "/etc/apache2/sites-available/{{ item }}" src: "/etc/apache2/sites-available/{{ item }}"
state: link state: link
with_items: with_items:
- 010-iiab.conf - 010-iiab.conf
when: is_debuntu when: is_debuntu
- name: Remove the default site container (debuntu) - name: Remove apache2 default config files (debuntu)
file: file:
dest: /etc/apache2/000-default.conf path: "{{ item }}"
state: absent state: absent
with_items:
- /etc/apache2/000-default.conf
- /etc/apache2/sites-enabled/000-default.conf
when: is_debuntu when: is_debuntu
- name: Create http pid dir - name: Create http pid dir /var/run/{{ apache_user }}
file: file:
path: "/var/run/{{ apache_user }}" path: "/var/run/{{ apache_user }}"
mode: 0755 mode: 0755
@ -126,14 +131,14 @@
name: admin name: admin
state: present state: present
- name: Add apache user to admin group - name: Add {{ apache_user }} (from variable apache_user) to admin group
user: user:
name: "{{ apache_user }}" name: "{{ apache_user }}"
groups: admin groups: admin
state: present state: present
createhome: no createhome: no
- name: Create httpd log dir - name: Create httpd log dir /var/log/{{ apache_service }}
file: file:
path: "/var/log/{{ apache_service }}" path: "/var/log/{{ apache_service }}"
mode: 0755 mode: 0755
@ -180,14 +185,14 @@
dest: /usr/bin/iiab-refresh-wiki-docs dest: /usr/bin/iiab-refresh-wiki-docs
mode: 0755 mode: 0755
- name: Give apache_user permission for poweroff - name: Give apache_user permission to poweroff
template: template:
src: 020_apache_poweroff.j2 src: 020_apache_poweroff.j2
dest: /etc/sudoers.d/020_apache_poweroff dest: /etc/sudoers.d/020_apache_poweroff
mode: 0755 mode: 0755
when: allow_apache_sudo when: allow_apache_sudo
- name: Remove apache_user permission for poweroff - name: Remove apache_user permission to poweroff
file: file:
dest: /etc/sudoers.d/020_apache_poweroff dest: /etc/sudoers.d/020_apache_poweroff
state: absent state: absent