From 879d27016133eb6e64ae772fd87163c115fee3ed 2020-05-06 13:53:55 From: Branko Majic Date: 2020-05-06 13:53:55 Subject: [PATCH] MAR-152: Drop support for Debian 8 Jessie from the web server role. --- diff --git a/docs/rolereference.rst b/docs/rolereference.rst index b36fcac537b618e170aeae76650315bb8020f26c..594969c8eaab274b49cf562e75387fd4c635b9df 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1394,7 +1394,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 8 (Jessie) - Debian 9 (Stretch) diff --git a/roles/web_server/defaults/main.yml b/roles/web_server/defaults/main.yml index c7a52e5edaabc3621683fd26e86fe035dc7c2332..8cd3b33ec90c626e0db44667539659dd494c3330 100644 --- a/roles/web_server/defaults/main.yml +++ b/roles/web_server/defaults/main.yml @@ -12,6 +12,6 @@ DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE- 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" diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml index dcb7f2ac44f896e166d6b6cd11fc313b8fb9c32e..a13fb68396e2c6bafdcb155cd2948db317a5aaa6 100644 --- a/roles/web_server/molecule/default/molecule.yml +++ b/roles/web_server/molecule/default/molecule.yml @@ -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 diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml index a4bbf86fa46b522aaa9ee2fb3a26086a1ca49f06..faad65329ba259dfa26b4add04bdd68d8bbd6c11 100644 --- a/roles/web_server/molecule/default/prepare.yml +++ b/roles/web_server/molecule/default/prepare.yml @@ -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: - 10.31.127.20: "client1" - 10.31.127.30: "parameters-mandatory" - 10.31.127.31: "parameters-optional" - - - name: Install curl for testing redirects and webpage content - apt: - name: curl - state: present - - hosts: stretch become: true tasks: diff --git a/roles/web_server/molecule/default/tests/conftest.py b/roles/web_server/molecule/default/tests/conftest.py index 16b03deae6031b487f68202f508a376c4d62b629..d81cd069a323d5d7b4dbf07630418aeed55e0385 100644 --- a/roles/web_server/molecule/default/tests/conftest.py +++ b/roles/web_server/molecule/default/tests/conftest.py @@ -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) diff --git a/roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.key b/roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.key deleted file mode 100644 index 7ff97f129be270d3d8711d21ac562d86fbc6a46d..0000000000000000000000000000000000000000 --- a/roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.key +++ /dev/null @@ -1,134 +0,0 @@ -Public Key Info: - Public Key Algorithm: RSA - Key Security Level: Medium (2048 bits) - -modulus: - 00:c0:7c:c1:64:b5:42:b5:c1:38:e8:02:5e:88:40:a2 - c5:d3:de:7e:72:77:d4:d9:72:88:62:05:85:75:67:96 - 09:97:2c:9b:91:58:0f:83:ef:c7:64:1e:53:ed:0f:3c - 10:e2:97:a3:20:c3:aa:f8:16:22:55:d8:e9:0a:19:9f - e7:3b:81:76:79:27:eb:56:c5:13:9f:f1:18:0b:e4:94 - 1b:d8:91:1e:65:64:b4:8c:5c:8d:79:f4:4d:e2:0a:5d - a5:53:82:27:b0:a7:da:19:8a:0b:f2:e2:da:87:b9:4e - 98:47:1a:1c:b6:4a:15:52:40:e0:21:67:a1:3c:88:dd - e2:fb:37:53:9c:1d:69:17:a8:85:7a:03:a6:87:d4:c0 - ea:da:73:7c:d9:91:e6:5f:aa:3d:28:dd:3d:33:aa:76 - 82:88:a0:5b:26:67:72:11:b2:16:03:78:c7:5c:cf:11 - f3:66:17:53:6e:ac:01:c7:7f:7a:57:a7:9e:c0:4d:74 - 3e:f2:5a:89:bf:c4:16:8f:b9:7f:c1:bb:b7:8b:b1:96 - 9e:5f:ac:84:fa:01:66:57:ba:46:a5:7e:da:09:e8:bb - 4a:26:13:44:b9:44:31:b7:82:6f:a5:8e:6c:23:8b:ea - 0c:af:42:88:6c:a7:24:82:51:60:42:cf:b3:8d:54:f2 - 23: - -public exponent: - 01:00:01: - -private exponent: - 00:b5:dd:e9:d7:de:4f:3e:6d:66:f8:07:2d:0c:2d:8d - dd:be:75:ed:20:f8:49:ba:7e:35:8f:ef:c9:8e:09:26 - 40:bf:7e:1d:2a:71:7a:8f:5d:21:16:5e:75:4b:79:66 - 76:49:b1:9e:26:99:d9:52:f7:8e:cf:6f:d7:97:7c:68 - 91:d0:ae:5c:a2:d2:6d:d0:18:fa:96:d6:f3:b2:60:f0 - f3:72:66:82:c2:a8:28:d2:a9:ab:de:7b:4e:8e:f0:de - 54:13:97:d9:2a:57:1d:81:9d:e5:f6:42:12:d9:c3:e3 - 17:8b:ae:87:4c:50:a8:de:83:7f:80:f0:69:ee:49:1e - e2:ef:a8:f2:f7:b1:0f:a1:f8:64:0e:8d:6b:f8:e8:5e - 52:24:f5:44:8d:23:76:e0:90:a4:f6:3b:98:46:93:58 - 3f:52:b1:12:f2:6f:02:96:40:0e:18:4d:19:20:20:3a - 33:6c:cd:2e:05:c0:1a:bf:6c:74:c3:02:bb:9a:7f:e5 - 4e:bf:47:d6:c8:ee:71:43:d0:6f:f6:4f:72:65:ec:1a - 76:91:18:97:6f:e7:21:df:22:9d:02:97:83:5b:52:ca - 86:6f:07:74:67:70:80:85:d2:44:0c:b6:f6:b3:10:f2 - b8:45:e9:8c:d1:c2:e7:67:6d:00:78:0e:30:c7:76:0f - 31: - -prime1: - 00:cf:69:36:e8:83:17:46:22:20:ec:59:24:f7:16:4f - 8e:08:69:0d:29:32:24:9d:90:fb:8e:97:65:ba:3b:50 - 5e:ca:92:cd:9d:4f:fb:e3:7b:2b:41:58:6c:3a:e8:cd - 91:d9:14:b1:e0:22:d6:df:ec:c8:06:e4:85:f7:00:f0 - 53:a7:89:20:21:d8:ff:a9:3a:4d:59:06:30:04:fa:98 - fd:60:bf:6f:3c:79:c3:ad:79:91:1c:a6:94:00:44:be - e7:43:59:5c:21:ab:1f:aa:c7:5b:e4:ad:d7:00:4c:13 - 7d:63:89:af:4c:b6:ea:86:b2:59:1d:c8:f7:ee:94:1e - 7b: - -prime2: - 00:ed:94:8b:24:82:ab:89:6a:16:d9:75:4b:a6:0c:fa - 1f:84:13:0d:df:b6:33:6d:30:bc:a5:ee:f1:e3:3f:bf - fd:9e:c9:a8:21:1e:49:8b:a8:d1:d7:f2:49:24:a5:b7 - 89:00:13:e7:a8:83:e6:00:09:fa:85:f2:a4:93:06:9f - 22:fd:c2:b0:a7:42:ca:20:17:d0:c6:41:14:6b:f1:71 - aa:eb:81:b3:d9:b9:30:a8:0f:41:07:74:a2:0e:32:2a - 43:7f:f8:7b:c9:3e:34:fe:e1:b9:a2:4f:f5:7a:aa:9d - 96:92:dc:98:2b:63:2d:07:5d:75:55:fd:7f:5f:56:7e - 79: - -coefficient: - 60:71:c7:2c:4c:6e:e5:a5:38:ec:28:3f:54:9b:d7:4c - 97:be:78:99:51:75:43:38:9a:8b:7e:d6:5a:c6:97:cc - ae:3b:34:83:aa:fc:f3:51:1a:69:38:b4:88:2e:f4:63 - 66:2f:23:92:3b:29:16:e1:52:91:37:d0:b3:e7:aa:2e - b6:b1:00:0a:a5:64:82:b0:8e:2f:25:9b:6f:eb:9f:56 - 46:57:75:9f:e6:65:36:42:c2:c9:e0:1c:b9:5d:b9:eb - 94:86:29:36:87:fc:92:5d:9a:ac:d9:c7:f9:b4:28:24 - 43:f2:4a:51:20:3b:db:9b:7f:a4:8f:d8:e4:6f:6a:94 - - -exp1: - 57:09:c2:1f:04:94:09:bc:5c:b0:92:20:2f:08:4f:ce - 3c:bd:48:e6:96:c2:42:d5:0a:9b:a5:f0:ec:9b:e3:78 - 43:ee:23:16:f6:ef:af:60:8a:a0:5b:68:df:b7:be:3c - 8c:2a:61:12:bb:cc:0c:20:23:38:b1:41:7e:8c:08:4e - 32:aa:1a:af:d9:8e:40:07:d5:59:9c:7d:1e:39:c3:65 - e0:e9:b4:d6:5e:0a:bd:8b:9c:57:b7:97:b8:1d:21:37 - 8f:4d:ba:99:ee:63:d5:98:df:79:31:72:5e:0f:8e:c6 - 39:b5:17:b9:4b:b1:53:61:18:80:a5:4b:55:f5:16:6d - - -exp2: - 4c:59:51:41:e1:70:48:cf:bc:1a:14:14:c4:7f:25:1e - 5d:ae:55:e6:0f:c2:85:13:85:7c:79:c6:68:36:43:77 - b8:c0:ab:74:41:2c:77:62:40:55:7a:7a:40:f9:b4:7a - a5:78:c0:18:aa:92:8e:6e:a6:80:c7:52:56:21:69:a0 - b0:16:11:f9:1e:80:a0:41:a7:09:1f:3e:f5:d5:78:a6 - e9:da:1b:b7:1b:49:64:a8:ca:48:20:16:38:23:ac:eb - 56:43:bf:5c:13:ce:aa:1e:56:2e:b0:2d:7e:47:38:2f - 7c:70:c1:c2:27:b3:ff:ca:eb:fb:3f:64:e0:79:86:59 - - - -Public Key PIN: - pin-sha256:8WMSWb7fAo1Mu4r8Cib3aGoqGUoXIP093eQI/lKAJ3g= -Public Key ID: - sha256:f1631259bedf028d4cbb8afc0a26f7686a2a194a1720fd3ddde408fe52802778 - sha1:2eb1121201a8f84def83e27fec8c60323f488a23 - ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAwHzBZLVCtcE46AJeiECixdPefnJ31NlyiGIFhXVnlgmXLJuR -WA+D78dkHlPtDzwQ4pejIMOq+BYiVdjpChmf5zuBdnkn61bFE5/xGAvklBvYkR5l -ZLSMXI159E3iCl2lU4InsKfaGYoL8uLah7lOmEcaHLZKFVJA4CFnoTyI3eL7N1Oc -HWkXqIV6A6aH1MDq2nN82ZHmX6o9KN09M6p2goigWyZnchGyFgN4x1zPEfNmF1Nu -rAHHf3pXp57ATXQ+8lqJv8QWj7l/wbu3i7GWnl+shPoBZle6RqV+2gnou0omE0S5 -RDG3gm+ljmwji+oMr0KIbKckglFgQs+zjVTyIwIDAQABAoIBAQC13enX3k8+bWb4 -By0MLY3dvnXtIPhJun41j+/JjgkmQL9+HSpxeo9dIRZedUt5ZnZJsZ4mmdlS947P -b9eXfGiR0K5cotJt0Bj6ltbzsmDw83JmgsKoKNKpq957To7w3lQTl9kqVx2BneX2 -QhLZw+MXi66HTFCo3oN/gPBp7kke4u+o8vexD6H4ZA6Na/joXlIk9USNI3bgkKT2 -O5hGk1g/UrES8m8ClkAOGE0ZICA6M2zNLgXAGr9sdMMCu5p/5U6/R9bI7nFD0G/2 -T3Jl7Bp2kRiXb+ch3yKdApeDW1LKhm8HdGdwgIXSRAy29rMQ8rhF6YzRwudnbQB4 -DjDHdg8xAoGBAM9pNuiDF0YiIOxZJPcWT44IaQ0pMiSdkPuOl2W6O1BeypLNnU/7 -43srQVhsOujNkdkUseAi1t/syAbkhfcA8FOniSAh2P+pOk1ZBjAE+pj9YL9vPHnD -rXmRHKaUAES+50NZXCGrH6rHW+St1wBME31jia9MtuqGslkdyPfulB57AoGBAO2U -iySCq4lqFtl1S6YM+h+EEw3ftjNtMLyl7vHjP7/9nsmoIR5Ji6jR1/JJJKW3iQAT -56iD5gAJ+oXypJMGnyL9wrCnQsogF9DGQRRr8XGq64Gz2bkwqA9BB3SiDjIqQ3/4 -e8k+NP7huaJP9XqqnZaS3JgrYy0HXXVV/X9fVn55AoGAVwnCHwSUCbxcsJIgLwhP -zjy9SOaWwkLVCpul8Oyb43hD7iMW9u+vYIqgW2jft748jCphErvMDCAjOLFBfowI -TjKqGq/ZjkAH1VmcfR45w2Xg6bTWXgq9i5xXt5e4HSE3j026me5j1ZjfeTFyXg+O -xjm1F7lLsVNhGIClS1X1Fm0CgYBMWVFB4XBIz7waFBTEfyUeXa5V5g/ChROFfHnG -aDZDd7jAq3RBLHdiQFV6ekD5tHqleMAYqpKObqaAx1JWIWmgsBYR+R6AoEGnCR8+ -9dV4punaG7cbSWSoykggFjgjrOtWQ79cE86qHlYusC1+RzgvfHDBwiez/8rr+z9k -4HmGWQKBgGBxxyxMbuWlOOwoP1Sb10yXvniZUXVDOJqLftZaxpfMrjs0g6r881Ea -aTi0iC70Y2YvI5I7KRbhUpE30LPnqi62sQAKpWSCsI4vJZtv659WRld1n+ZlNkLC -yeAcuV2565SGKTaH/JJdmqzZx/m0KCRD8kpRIDvbm3+kj9jkb2qU ------END RSA PRIVATE KEY----- diff --git a/roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.pem b/roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.pem deleted file mode 100644 index 7f3d8cec073d531079baeaea6a4fa250b56e38b0..0000000000000000000000000000000000000000 --- a/roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-jessie64_https.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIELDCCApSgAwIBAgIMWWXRlyNKFAsg+sh2MA0GCSqGSIb3DQEBCwUAMEgxIjAg -BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w -bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNzEyMDczNjU1WhcNMjcwNzEwMDcz -NjU1WjBFMR8wHQYDVQQDExZFeGFtcGUgSW5jLiBXZWIgU2VydmVyMRUwEwYDVQQK -EwxFeGFtcGxlIEluYy4xCzAJBgNVBAYTAlNFMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAwHzBZLVCtcE46AJeiECixdPefnJ31NlyiGIFhXVnlgmXLJuR -WA+D78dkHlPtDzwQ4pejIMOq+BYiVdjpChmf5zuBdnkn61bFE5/xGAvklBvYkR5l -ZLSMXI159E3iCl2lU4InsKfaGYoL8uLah7lOmEcaHLZKFVJA4CFnoTyI3eL7N1Oc -HWkXqIV6A6aH1MDq2nN82ZHmX6o9KN09M6p2goigWyZnchGyFgN4x1zPEfNmF1Nu -rAHHf3pXp57ATXQ+8lqJv8QWj7l/wbu3i7GWnl+shPoBZle6RqV+2gnou0omE0S5 -RDG3gm+ljmwji+oMr0KIbKckglFgQs+zjVTyIwIDAQABo4GYMIGVMAwGA1UdEwEB -/wQCMAAwHwYDVR0RBBgwFoIUcGFyYW1ldGVycy1tYW5kYXRvcnkwEwYDVR0lBAww -CgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQULrESEgGo+E3v -g+J/7IxgMj9IiiMwHwYDVR0jBBgwFoAUN2vbkxxpfpJMa99zhfiEllmBT2swDQYJ -KoZIhvcNAQELBQADggGBAI1mG7d1wPpA40JmBYll2KasIH/ldLN2eu8rAdM00Rep -KPeMCwOEIoJp3LZL43fubQKP0okw1JstskQt6PPNbL53I8hIhUmKUQEEYXG3AIB8 -p7w2BSq+ROV3Te3Eu+aSCT+sXGnu7FPbioMoZb90tHdZWxMvDGGN/HNXFevM0h5j -8vf6O+HlBLXU5mClpyD95OR+ULvYwWWhFwWar6mM0l2ByffJzl21iRZT5pBnnEQY -7A9RhUwb7f++uByPlKl08OGAaf2fl9VQUIK2mbjRu3ARfFQWyB+8Mq3EqkYSxRA3 -dpe+thQ8u4dUddJnDdHT5L0/odkCWHfN7512+kCbV4fYq+iSWnIBF6yEa09WLLdq -a5PHo/GGcA8P2SBGh0Jay/NSKpaIGhrCYp5mxiXm60oAHMYPXHZW0U28vtlAXkJb -KeCCgR/4Wa0G0QnbiT29s5yDIYy3YgSL+3Ug3y0XGRKMaMzVNA4p4CBbJo1ybhVu -XMygMYr+69hXbaCoeWn2Bg== ------END CERTIFICATE-----