Skip to content
Snippets Groups Projects
Commit f919ced4 authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Remove jessie references

jessie is EOL, remove it
parent d83adcb3
No related branches found
No related tags found
No related merge requests found
--- ---
# file: mediawiki/tasks/main.yml # file: mediawiki/tasks/main.yml
- name: ensure packages for mediawiki are installed on jessie - name: ensure packages for mediawiki are installed
apt: apt:
name: mediawiki name: mediawiki
state: present state: present
install_recommends: false
when: debian_version == "jessie"
tags:
- mediawiki
- webservices
- name: ensure packages for mediawiki are installed on stretch
apt:
name: mediawiki
state: present
when: debian_version == "stretch"
tags: tags:
- mediawiki - mediawiki
- webservices - webservices
......
--- ---
# file: mediawiki/tasks/mysql.yml # file: mediawiki/tasks/mysql.yml
- name: ensure php can talk with mysql on jessie - name: ensure php can talk with mysql
apt:
name: php5-mysql
state: present
when: debian_version == "jessie"
tags:
- mediawiki
- webservices
- name: ensure php can talk with mysql on stretch
apt: apt:
name: php-mysql name: php-mysql
state: present state: present
when: debian_version == "stretch"
tags: tags:
- mediawiki - mediawiki
- webservices - webservices
--- ---
# file: mediawiki/tasks/postgres.yml # file: mediawiki/tasks/postgres.yml
- name: ensure php can talk with postgres on jessie - name: ensure php can talk with postgres
apt:
name: php5-pgsql
state: present
when: debian_version == "jessie"
tags:
- mediawiki
- webservices
- name: ensure php can talk with postgres on stretch
apt: apt:
name: php-pgsql name: php-pgsql
state: present state: present
when: debian_version == "stretch"
tags: tags:
- mediawiki - mediawiki
- webservices - webservices
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
owner: root owner: root
group: root group: root
mode: '0644' mode: '0644'
when: debian_version != "jessie"
with_items: "{{ fpm_pools|default([]) }}" with_items: "{{ fpm_pools|default([]) }}"
notify: notify:
- restart php-fpm - restart php-fpm
......
...@@ -44,9 +44,7 @@ log-x-forwarded-for = ...@@ -44,9 +44,7 @@ log-x-forwarded-for =
{% if app_python_version == 2 %} {% if app_python_version == 2 %}
plugin = python27 plugin = python27
{% elif app_python_version == 3 %} {% elif app_python_version == 3 %}
{% if debian_version == "jessie" %} {% if debian_version == "stretch" %}
plugin = python34
{% elif debian_version == "stretch" %}
plugin = python35 plugin = python35
{% elif debian_version == "buster" %} {% elif debian_version == "buster" %}
plugin = python37 plugin = python37
......
{% set always="always" %}
{% if ansible_facts.distribution_major_version is version('9', '<') %}
{# nginx in jessie does not support always #}
{% set always="" %}
{% endif %}
{% if server.http_forward|default(true) %} {% if server.http_forward|default(true) %}
add_header Strict-Transport-Security "max-age=15768000" {{always}}; add_header Strict-Transport-Security "max-age=15768000" always;
{% endif %} {% endif %}
{% if server.xss_protect|default(true) %} {% if server.xss_protect|default(true) %}
add_header X-XSS-Protection "1; mode=block" {{always}}; add_header X-XSS-Protection "1; mode=block" always;
{% endif %} {% endif %}
{% if server.no_sniff|default(true) %} {% if server.no_sniff|default(true) %}
add_header X-Content-Type-Options "nosniff" {{always}}; add_header X-Content-Type-Options "nosniff" always;
{% endif %} {% endif %}
{% if server.referrer_policy|default(true) %} {% if server.referrer_policy|default(true) %}
{% if server.referrer_policy is defined %} {% if server.referrer_policy is defined %}
add_header Referrer-Policy "{{ server.referrer_policy }}" {{always}}; add_header Referrer-Policy "{{ server.referrer_policy }}" always;
{% else %} {% else %}
add_header Referrer-Policy "same-origin" {{always}}; add_header Referrer-Policy "same-origin" always;
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if server.expect_ct|default(true) %} {% if server.expect_ct|default(true) %}
{% if server.expect_ct is defined %} {% if server.expect_ct is defined %}
add_header Expect-CT "{{ server.expect_ct }}" {{always}}; add_header Expect-CT "{{ server.expect_ct }}" always;
{% else %} {% else %}
add_header Expect-CT "max-age=86400, enforce" {{always}}; add_header Expect-CT "max-age=86400, enforce" always;
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if server.cors|default(false) %} {% if server.cors|default(false) %}
{% if server.cors is defined %} {% if server.cors is defined %}
add_header Access-Control-Allow-Origin "{{ server.cors }}" {{always}}; add_header Access-Control-Allow-Origin "{{ server.cors }}" always;
{% else %} {% else %}
add_header Access-Control-Allow-Origin "'*'" {{always}}; add_header Access-Control-Allow-Origin "'*'" always;
{% endif %} {% endif %}
{% if not server.no_sniff|default(true) %} {% if not server.no_sniff|default(true) %}
add_header X-Content-Type-Options "nosniff" {{always}}; add_header X-Content-Type-Options "nosniff" always;
{% endif %} {% endif %}
{% if not server.csp|default(true) %} {% if not server.csp|default(true) %}
add_header Content-Security-Policy "default-src 'none'; frame-ancestors 'none'" {{always}}; add_header Content-Security-Policy "default-src 'none'; frame-ancestors 'none'" always;
add_header X-Frame-Options "DENY" {{always}}; add_header X-Frame-Options "DENY" always;
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if server.csp|default(true) %} {% if server.csp|default(true) %}
{% if server.csp is defined and server.csp == 'self' %} {% if server.csp is defined and server.csp == 'self' %}
add_header Content-Security-Policy "object-src 'none'; default-src 'self'; frame-ancestors 'none'; block-all-mixed-content" {{always}}; add_header Content-Security-Policy "object-src 'none'; default-src 'self'; frame-ancestors 'none'; block-all-mixed-content" always;
add_header X-Frame-Options "DENY" {{always}}; add_header X-Frame-Options "DENY" always;
{% elif server.csp is defined %} {% elif server.csp is defined %}
{% if 'frame-ancestors' in server.csp %} {% if 'frame-ancestors' in server.csp %}
{% if server.csp['frame-ancestors'] == "'self'" %} {% if server.csp['frame-ancestors'] == "'self'" %}
add_header X-Frame-Options "SAMEORIGIN" {{always}}; add_header X-Frame-Options "SAMEORIGIN" always;
{% else %} {% else %}
add_header X-Frame-Options "DENY" {{always}}; add_header X-Frame-Options "DENY" always;
{% endif %} {% endif %}
{% else %} {% else %}
add_header X-Frame-Options "DENY" {{always}}; add_header X-Frame-Options "DENY" always;
{% set x=server.csp.__setitem__("frame-ancestors", "'none'") %} {% set x=server.csp.__setitem__("frame-ancestors", "'none'") %}
{% endif %} {% endif %}
{% set directives = [] %} {% set directives = [] %}
{% for key, value in server.csp.items() %} {% for key, value in server.csp.items() %}
{{ directives.append(key ~ ' ' ~ value) }} {{ directives.append(key ~ ' ' ~ value) }}
{% endfor %} {% endfor %}
add_header Content-Security-Policy "{{ directives|join('; ') }}" {{always}}; add_header Content-Security-Policy "{{ directives|join('; ') }}" always;
{% else %} {% else %}
add_header Content-Security-Policy "object-src 'self'; default-src 'self' data: 'unsafe-eval' 'unsafe-inline'; frame-ancestors 'none'" {{always}}; add_header Content-Security-Policy "object-src 'self'; default-src 'self' data: 'unsafe-eval' 'unsafe-inline'; frame-ancestors 'none'" always;
add_header X-Frame-Options "DENY" {{always}}; add_header X-Frame-Options "DENY" always;
{% endif %} {% endif %}
{% endif %} {% endif %}
...@@ -17,18 +17,6 @@ ...@@ -17,18 +17,6 @@
name: wordpress name: wordpress
state: present state: present
install_recommends: false install_recommends: false
default-release: jessie-backports
when: debian_version == 'jessie'
tags:
- wordpress
- webservices
- name: ensure the wordpress package is installed
apt:
name: wordpress
state: present
install_recommends: false
when: debian_version != 'jessie'
tags: tags:
- wordpress - wordpress
- webservices - webservices
......
--- ---
# file: wordpress/tasks/mysql.yml # file: wordpress/tasks/mysql.yml
#
- name: ensure php can talk with mysql
apt:
name: php5-mysql
state: present
when: debian_version == 'jessie'
tags:
- wordpress
- webservices
- name: ensure php can talk with mysql - name: ensure php can talk with mysql
apt: apt:
name: php-mysql name: php-mysql
state: present state: present
when: debian_version == 'stretch'
tags: tags:
- wordpress - wordpress
- webservices - webservices
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment