majic-ansible-roles Changeset

Changeset - 879d27016133

Parent rev.

Child rev.

[Not reviewed]

2 5 0

Branko Majic (branko) - 4 years ago 2020-05-06 13:53:55
branko@majic.rs

MAR-152: Drop support for Debian 8 Jessie from the web server role.

7 files changed with 5 insertions and 229 deletions:

docs/rolereference.rst

roles/web_server/defaults/main.yml

roles/web_server/molecule/default/molecule.yml

roles/web_server/molecule/default/prepare.yml

roles/web_server/molecule/default/tests/conftest.py

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.key

134

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.pem

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -1394,7 +1394,6 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 8 (Jessie)
 - Debian 9 (Stretch)

roles/web_server/defaults/main.yml

➞

Show inline comments

 ECDHE-RSA-AES256-SHA384:!aNULL:!MD5:!EXPORT"
 # Internal parameters
 php_fpm_package_name: "{% if ansible_distribution_release == 'jessie' %}php5-fpm{% elif ansible_distribution_release == 'stretch' %}php-fpm{% endif %}"
 php_fpm_service_name: "{% if ansible_distribution_release == 'jessie' %}php5-fpm{% elif ansible_distribution_release == 'stretch' %}php7.0-fpm{% endif %}"
 php_base_config_dir: "{% if ansible_distribution_release == 'jessie' %}/etc/php5{% elif ansible_distribution_release == 'stretch' %}/etc/php/7.0{% endif %}"
 php_fpm_package_name: "php-fpm"
 php_fpm_service_name: "php7.0-fpm"
 php_base_config_dir: "/etc/php/7.0"

roles/web_server/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -14,19 +14,6 @@ lint: @@
 platforms:
   - name: client1-jessie
     groups:
       - client
       - jessie
     box: debian/contrib-jessie64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.20
         network_name: private_network
         type: static
   - name: client1-stretch
     groups:
       - client
@@ @@ -40,32 +27,6 @@ platforms: @@
         network_name: private_network
         type: static
   - name: parameters-mandatory-jessie64
     groups:
       - parameters-mandatory
       - jessie
     box: debian/contrib-jessie64
     memory: 512
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.30
         network_name: private_network
         type: static
   - name: parameters-optional-jessie64
     groups:
       - parameters-optional
       - jessie
     box: debian/contrib-jessie64
     memory: 512
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.31
         network_name: private_network
         type: static
   - name: parameters-mandatory-stretch64
     groups:
       - parameters-mandatory

roles/web_server/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -18,29 +18,6 @@ @@
         update_cache: true
       changed_when: false
 - hosts: jessie
   become: true
   tasks:
     - name: Set-up the hosts file
       lineinfile:
         path: /etc/hosts
         regexp: "^{{ item.key }}"
         line: "{{ item.key }} {{ item.value }}"
         owner: root
         group: root
         mode: 0644
         state: present
       with_dict:
 .31.127.20: "client1"
 .31.127.30: "parameters-mandatory"
 .31.127.31: "parameters-optional"
     - name: Install curl for testing redirects and webpage content
       apt:
         name: curl
         state: present
 - hosts: stretch
   become: true
   tasks:

roles/web_server/molecule/default/tests/conftest.py

➞

Show inline comments

@@ @@ -10,7 +10,7 @@ def php_info(host): @@
     name, PHP-FPM service name, and PHP base configuration directory
     is based on Debian release.
-    Currently supports Debian 8 (Jessie), and Debian 9 (Stretch).
     Currently supports Debian 9 (Stretch).
     Resulting information can be accessed through returned named tuple
     with the following properties:
@@ @@ -25,9 +25,7 @@ def php_info(host): @@
     ansible_facts = host.ansible("setup")["ansible_facts"]
     ansible_distribution_release = ansible_facts['ansible_distribution_release']
     if ansible_distribution_release == 'jessie':
         info = PHPInfo(fpm_package='php5-fpm', fpm_service='php5-fpm', base_config_dir='/etc/php5')
     elif ansible_distribution_release == 'stretch':
     if ansible_distribution_release == 'stretch':
         info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.0-fpm', base_config_dir='/etc/php/7.0')
     else:
         raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.key

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.pem

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)