standardization for Debian versions : we use "jessie" or "9 or later" to prepare buster smoothly as possible
This commit is contained in:
parent
bcd333aaa9
commit
2bb7367edf
|
@ -22,5 +22,5 @@
|
||||||
validate: '/usr/sbin/visudo -cf %s'
|
validate: '/usr/sbin/visudo -cf %s'
|
||||||
when:
|
when:
|
||||||
- ansible_distribution == "Debian"
|
- ansible_distribution == "Debian"
|
||||||
- ansible_distribution_major_version | version_compare('9', '<')
|
- ansible_distribution_release == "jessie"
|
||||||
- not copy_sudoers_evolinux.changed
|
- not copy_sudoers_evolinux.changed
|
||||||
|
|
|
@ -39,12 +39,12 @@
|
||||||
group:
|
group:
|
||||||
name: "{{ admin_users_group }}"
|
name: "{{ admin_users_group }}"
|
||||||
|
|
||||||
- name: "Add user to sudo group (Stretch)"
|
- name: "Add user to sudo group (Debian 9 or later)"
|
||||||
user:
|
user:
|
||||||
name: '{{ user.name }}'
|
name: '{{ user.name }}'
|
||||||
groups: 'sudo,{{ admin_users_group }}'
|
groups: 'sudo,{{ admin_users_group }}'
|
||||||
append: yes
|
append: yes
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
- name: "Fix perms on homedirectory for '{{ user.name }}'"
|
- name: "Fix perms on homedirectory for '{{ user.name }}'"
|
||||||
file:
|
file:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- name: packages are installed (stretch)
|
- name: packages are installed (Debian 9 or later)
|
||||||
apt:
|
apt:
|
||||||
name: '{{ item }}'
|
name: '{{ item }}'
|
||||||
state: present
|
state: present
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
tags:
|
tags:
|
||||||
- apache
|
- apache
|
||||||
- packages
|
- packages
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
- name: packages are installed (jessie)
|
- name: packages are installed (jessie)
|
||||||
apt:
|
apt:
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
squid_service_name: squid3
|
squid_service_name: squid3
|
||||||
when:
|
when:
|
||||||
- ansible_distribution == "Debian"
|
- ansible_distribution == "Debian"
|
||||||
- ansible_distribution_major_version | version_compare('9', '<')
|
- ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- name: Let's Encrypt OCSP server is authorized by squid
|
- name: Let's Encrypt OCSP server is authorized by squid
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
option: "disable_functions"
|
option: "disable_functions"
|
||||||
value: "shell-exec,system,passthru,putenv,popen"
|
value: "shell-exec,system,passthru,putenv,popen"
|
||||||
notify: reload apache
|
notify: reload apache
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
- name: Install evoadmin VHost
|
- name: Install evoadmin VHost
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -109,6 +109,9 @@
|
||||||
with_items:
|
with_items:
|
||||||
- { option: "confirm", value: "1" }
|
- { option: "confirm", value: "1" }
|
||||||
- { option: "which", value: "both" }
|
- { option: "which", value: "both" }
|
||||||
when: evolinux_packages_listchanges and ansible_distribution == "Debian" and ansible_distribution_major_version | version_compare('9', '<')
|
when:
|
||||||
|
- evolinux_packages_listchanges
|
||||||
|
- ansible_distribution == "Debian"
|
||||||
|
- ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- meta: flush_handlers
|
- meta: flush_handlers
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
register: squid_whitelist_files
|
register: squid_whitelist_files
|
||||||
|
|
||||||
- name: set squid_service_name=squid3 for Debian < 9
|
- name: set squid_service_name=squid3 for Debian 8
|
||||||
set_fact:
|
set_fact:
|
||||||
squid_service_name: squid3
|
squid_service_name: squid3
|
||||||
when:
|
when:
|
||||||
- ansible_distribution == "Debian"
|
- ansible_distribution == "Debian"
|
||||||
- ansible_distribution_major_version | version_compare('9', '<')
|
- ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- name: Append packages.dotdeb.org to Squid whitelist
|
- name: Append packages.dotdeb.org to Squid whitelist
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
|
|
@ -7,12 +7,12 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
register: squid_whitelist_files
|
register: squid_whitelist_files
|
||||||
|
|
||||||
- name: set squid_service_name=squid3 for Debian < 9
|
- name: set squid_service_name=squid3 for Debian 8
|
||||||
set_fact:
|
set_fact:
|
||||||
squid_service_name: squid3
|
squid_service_name: squid3
|
||||||
when:
|
when:
|
||||||
- ansible_distribution == "Debian"
|
- ansible_distribution == "Debian"
|
||||||
- ansible_distribution_major_version | version_compare('9', '<')
|
- ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- name: Append packages.dotdeb.org to Squid whitelist
|
- name: Append packages.dotdeb.org to Squid whitelist
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- include: packages_stretch.yml
|
- include: packages_stretch.yml
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
- include: packages_jessie.yml
|
- include: packages_jessie.yml
|
||||||
when: ansible_distribution_release == "jessie"
|
when: ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- include: users_stretch.yml
|
- include: users_stretch.yml
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
- include: users_jessie.yml
|
- include: users_jessie.yml
|
||||||
when: ansible_distribution_release == "jessie"
|
when: ansible_distribution_release == "jessie"
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
# url: https://download.newrelic.com/548C16BF.gpg
|
# url: https://download.newrelic.com/548C16BF.gpg
|
||||||
data: "{{ lookup('file', '548C16BF.gpg') }}"
|
data: "{{ lookup('file', '548C16BF.gpg') }}"
|
||||||
|
|
||||||
- name: set squid_service_name=squid3 for Debian < 9
|
- name: set squid_service_name=squid3 for Debian 8
|
||||||
set_fact:
|
set_fact:
|
||||||
squid_service_name: squid3
|
squid_service_name: squid3
|
||||||
when:
|
when:
|
||||||
- ansible_distribution == "Debian"
|
- ansible_distribution == "Debian"
|
||||||
- ansible_distribution_major_version | version_compare('9', '<')
|
- ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- name: Find squid config whitelist
|
- name: Find squid config whitelist
|
||||||
shell: find /etc/{{ squid_service_name | default('squid') }}/whitelist-custom.conf /etc/{{ squid_service_name | default('squid') }}/whitelist.conf 2> /dev/null
|
shell: find /etc/{{ squid_service_name | default('squid') }}/whitelist-custom.conf /etc/{{ squid_service_name | default('squid') }}/whitelist.conf 2> /dev/null
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
when: ansible_distribution_release == "jessie"
|
when: ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- include: packages_stretch.yml
|
- include: packages_stretch.yml
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
# TODO: find a way to override the main configuration
|
# TODO: find a way to override the main configuration
|
||||||
# without touching the main file
|
# without touching the main file
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
when: ansible_distribution_release == "jessie"
|
when: ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
- include: php.yml
|
- include: php.yml
|
||||||
when: ansible_distribution_release == "stretch"
|
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
|
|
||||||
- include: phpmyadmin.yml
|
- include: phpmyadmin.yml
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
apt:
|
apt:
|
||||||
name: php5-fpm
|
name: php5-fpm
|
||||||
state: present
|
state: present
|
||||||
when: ansible_distribution_major_version | version_compare('8', '<=')
|
when:
|
||||||
|
- ansible_distribution == "Debian"
|
||||||
|
- ansible_distribution_release == "jessie"
|
||||||
tags:
|
tags:
|
||||||
- php-fpm
|
- php-fpm
|
||||||
|
|
||||||
|
@ -10,6 +12,8 @@
|
||||||
apt:
|
apt:
|
||||||
name: php-fpm
|
name: php-fpm
|
||||||
state: present
|
state: present
|
||||||
when: ansible_distribution_major_version | version_compare('9', '>=')
|
when:
|
||||||
|
- ansible_distribution == "Debian"
|
||||||
|
- ansible_distribution_major_version | version_compare('9', '>=')
|
||||||
tags:
|
tags:
|
||||||
- php-fpm
|
- php-fpm
|
||||||
|
|
Loading…
Reference in a new issue