From 2c6171e649745b2ef43726b91d0725d883111d62 Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Fri, 17 Jan 2020 00:46:06 -0500 Subject: [PATCH] Debian 10 compatibility Change inventory defaults to use the environments directory and add what is necessary for Debian 10. --- .gitignore | 2 ++ ansible.cfg | 3 +++ roles/ansible/tasks/main.yml | 16 ++++++++++++++++ roles/webserver/tasks/main.yml | 23 ++++++++++++++++------- site.yml => webserver.yml | 3 ++- 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 roles/ansible/tasks/main.yml rename site.yml => webserver.yml (93%) diff --git a/.gitignore b/.gitignore index 9ea6295..0654ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ # Unneeded ansible file *.retry +# Custom environments +/environments/ diff --git a/ansible.cfg b/ansible.cfg index 1b26d78..61712fd 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,3 +1,6 @@ +[defaults] +inventory = ./environments/development + [ssh_connection] pipelining=True diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml new file mode 100644 index 0000000..5aa5408 --- /dev/null +++ b/roles/ansible/tasks/main.yml @@ -0,0 +1,16 @@ +- name: 'Install Ansible dependency: python-apt' + shell: 'apt-get update && apt-get install python-apt -y' + args: + creates: /usr/lib/python2.7/dist-packages/apt + warn: false + +- name: 'Install Ansible dependency: aptitude' + apt: + name: 'aptitude' + state: present + force_apt_get: true + +- name: 'Install Ansible dependency: python-docker' + apt: + name: python-docker + state: present diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml index 258f3ca..a65049e 100644 --- a/roles/webserver/tasks/main.yml +++ b/roles/webserver/tasks/main.yml @@ -14,18 +14,27 @@ - name: Install Apache2 Web Server - apt: name=apache2 state=present + apt: + name: apache2 + state: present - name: Start Apache2 Web Server - service: name=apache2 state=started + service: + name: apache2 + state: started - name: Install PHP - apt: name=php state=present + apt: + name: php + state: present - name: Install PHP MySQL Extension - apt: name=php-mysql state=present + apt: + name: php-mysql + state: present notify: Reload Apache2 -- name: Install MySQL Server - apt: name=mysql-server state=present - +- name: Install MariaDB Server + apt: + name: mariadb-server + state: present diff --git a/site.yml b/webserver.yml similarity index 93% rename from site.yml rename to webserver.yml index 974b0e2..6d0f452 100644 --- a/site.yml +++ b/webserver.yml @@ -13,10 +13,11 @@ # along with this program. If not, see . -- name: Install FRITA Infrastructure +- name: Install FRITA Web Server hosts: all become: yes roles: + - ansible - webserver - wordpress - nextcloud