From b0524d2a2e5f97b2ee8b050434420837e0fbf87f Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sun, 5 Nov 2017 00:54:53 +0200 Subject: [PATCH] Remove references to Debian 8 I don't need or want to support Debian 8 anymore so I can remove all references to it in comments and code. --- README.md | 2 +- roles/common/tasks/ntp.yml | 2 +- roles/php-fpm/handlers/main.yml | 4 ---- roles/php-fpm/tasks/Debian.yml | 31 ------------------------------- roles/php-fpm/tasks/main.yml | 5 ----- 5 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 roles/php-fpm/tasks/Debian.yml diff --git a/README.md b/README.md index 5bdb5f5..c2ab631 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Ansible playbook for base and initial configuration of the web server hosting my ## Assumptions Before you can run this, a few things are assumed: -- You have a clean, minimal Debian 8, Debian 9, or Ubuntu 16.04 host up and running +- You have a clean, minimal Debian 9 or Ubuntu 16.04 host up and running - You have a user account with password-less SSH access to the machine - You have sudo privileges on the remote host - You have created a `hosts` file with something like: diff --git a/roles/common/tasks/ntp.yml b/roles/common/tasks/ntp.yml index edf90ea..db4d5e8 100644 --- a/roles/common/tasks/ntp.yml +++ b/roles/common/tasks/ntp.yml @@ -1,5 +1,5 @@ --- -# Hosts running Ubuntu 16.04 or Debian 8 use the systemd init system and should +# Hosts running Ubuntu 16.04 and Debian 9 use the systemd init system and should # use timedatectl as a network time client instead of the standalone ntp client. # Earlier versions of those distros should use the ntp/ntpd package. diff --git a/roles/php-fpm/handlers/main.yml b/roles/php-fpm/handlers/main.yml index 2217ea6..2067b3a 100644 --- a/roles/php-fpm/handlers/main.yml +++ b/roles/php-fpm/handlers/main.yml @@ -1,8 +1,4 @@ --- -# For Debian 8 -- name: restart php5-fpm - service: name=php5-fpm state=restarted - # For Ubuntu 16.04 and Debian 9 - name: reload php7.0-fpm systemd: name=php7.0-fpm state=reloaded diff --git a/roles/php-fpm/tasks/Debian.yml b/roles/php-fpm/tasks/Debian.yml deleted file mode 100644 index fbc3bb8..0000000 --- a/roles/php-fpm/tasks/Debian.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- name: Install php5-fpm and deps - apt: name={{ item }} state=present update_cache=yes - with_items: - - php5-fpm - # for WordPress - - php5-mysql - - php5-gd - - php5-curl - tags: php-fpm, packages - -# only copy php-fpm config for vhosts that need WordPress or PHP -- name: Copy php5-fpm pool config - template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644 - with_items: "{{ nginx_vhosts }}" - when: (item.has_wordpress is defined and item.has_wordpress == True) or (item.needs_php is defined and item.needs_php == True) - notify: restart php5-fpm - tags: php-fpm - -- name: Remove default www pool - file: path=/etc/php5/fpm/pool.d/www.conf state=absent - notify: restart php5-fpm - tags: php-fpm - -# re-configure php.ini -- name: Update php.ini - template: src=php.ini.j2 dest=/etc/php5/fpm/php.ini owner=root group=root mode=0644 - notify: restart php5-fpm - tags: php-fpm - -# vim: set ts=2 sw=2: diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml index b177dfe..b9abec4 100644 --- a/roles/php-fpm/tasks/main.yml +++ b/roles/php-fpm/tasks/main.yml @@ -2,11 +2,6 @@ # Note: Debian 9's php-fpm config is identical to Ubuntu 16.04's, so for now we # can capitalize on that and use the same tasks. -- name: Configure php-fpm on old Debian - import_tasks: Debian.yml - when: ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '<') - tags: php-fpm - - name: Configure php-fpm on Ubuntu and Debian 9 import_tasks: Ubuntu.yml when: ansible_distribution == 'Ubuntu' or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '=='))