From efa62ad66d468a760b243a2d0bae93f8c7d9a893 Mon Sep 17 00:00:00 2001 From: Corey Reichle Date: Fri, 21 Dec 2018 13:02:04 -0500 Subject: [PATCH] Cleaned up indents and schtuff, run is clean --- roles/shell/tasks/users/ubergeek.yml | 1 + roles/webserver/tasks/apache.yml | 118 +++++++++++++++------------ roles/webserver/tasks/main.yml | 13 ++- roles/webserver/tasks/packages.yml | 50 ++++++------ roles/webserver/tasks/users.yml | 2 +- 5 files changed, 100 insertions(+), 84 deletions(-) diff --git a/roles/shell/tasks/users/ubergeek.yml b/roles/shell/tasks/users/ubergeek.yml index 0474c60b..68513f2a 100644 --- a/roles/shell/tasks/users/ubergeek.yml +++ b/roles/shell/tasks/users/ubergeek.yml @@ -1,4 +1,5 @@ --- +- name: Setting up ubergeek user: name: ubergeek groups: tilde,sudo diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml index 449c890e..0b3ec921 100644 --- a/roles/webserver/tasks/apache.yml +++ b/roles/webserver/tasks/apache.yml @@ -1,70 +1,86 @@ #This play configs apapche for us --- -name: Deploy 000-default.conf - - copy: +- name: Deploy 000-default.conf + copy: src: ../files/etc/apache2/sites-available/000-default.conf - dest: /etc/apache2/sites/available/000-default.conf -name: Deploy default-ssl.conf - - copy: + dest: /etc/apache2/sites-available/000-default.conf + +- name: Deploy default-ssl.conf + copy: src: ../files/etc/apache2/sites-available/default-ssl.conf - dest: /etc/apache2/sites/available/default-ssl.conf -name: Deploy ftp.summit.ttm.sh.conf - - copy: + dest: /etc/apache2/sites-available/default-ssl.conf + +- name: Deploy ftp.summit.ttm.sh.conf + copy: src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf - dest: /etc/apache2/sites/available/ftp.summit.ttm.sh.conf -name: Deploy ftp.summit.ttm.sh-le-ssl.conf - - copy: + dest: /etc/apache2/sites-available/ftp.summit.ttm.sh.conf + +- name: Deploy ftp.summit.ttm.sh-le-ssl.conf + copy: src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf - dest: /etc/apache2/sites/available/ftp.summit.ttm.sh-le-ssl.conf -name: Deploy mail.thunix.cf.conf - - copy: + dest: /etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf + +- name: Deploy mail.thunix.cf.conf + copy: src: ../files/etc/apache2/sites-available/mail.thunix.cf.conf - dest: /etc/apache2/sites/available/mail.thunix.cf.conf -name: Deploy mail.thunix.cf-le-ssl.conf - - copy: + dest: /etc/apache2/sites-available/mail.thunix.cf.conf + +- name: Deploy mail.thunix.cf-le-ssl.conf + copy: src: ../files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf - dest: /etc/apache2/sites/available/mail.thunix.cf-le-ssl.conf -name: Deploy ny.dyniform.net.conf - - copy: + dest: /etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf + +- name: Deploy ny.dyniform.net.conf + copy: src: ../files/etc/apache2/sites-available/ny.dyniform.net.conf - dest: /etc/apache2/sites/available/ny.dyniform.net.conf -name: Deploy summit-nosite.conf - - copy: + dest: /etc/apache2/sites-available/ny.dyniform.net.conf + +- name: Deploy summit-nosite.conf + copy: src: ../files/etc/apache2/sites-available/summit-nosite.conf - dest: /etc/apache2/sites/available/summit-nosite.conf -name: Deploy summit.ttm.sh.conf - - copy: + dest: /etc/apache2/sites-available/summit-nosite.conf + +- name: Deploy summit.ttm.sh.conf + copy: src: ../files/etc/apache2/sites-available/summit.ttm.sh.conf - dest: /etc/apache2/sites/available/summit.ttm.sh.conf -name: Deploy summit.ttm.sh-le-ssl.conf - - copy: + dest: /etc/apache2/sites-available/summit.ttm.sh.conf + +- name: Deploy summit.ttm.sh-le-ssl.conf + copy: src: ../files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf - dest: /etc/apache2/sites/available/summit.ttm.sh-le-ssl.conf -name: Deploy thunix.cf.conf - - copy: + dest: /etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf + +- name: Deploy thunix.cf.conf + copy: src: ../files/etc/apache2/sites-available/thunix.cf.conf - dest: /etc/apache2/sites/available/thunix.cf.conf -name: Deploy thunix.cf-le-ssl.conf - - copy: + dest: /etc/apache2/sites-available/thunix.cf.conf + +- name: Deploy thunix.cf-le-ssl.conf + copy: src: ../files/etc/apache2/sites-available/thunix.cf-le-ssl.conf - dest: /etc/apache2/sites/available/thunix.cf-le-ssl.conf -name: Deploy thunix.tilde.chat.conf - - copy: + dest: /etc/apache2/sites-available/thunix.cf-le-ssl.conf + +- name: Deploy thunix.tilde.chat.conf + copy: src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf - dest: /etc/apache2/sites/available/thunix.tilde.chat.conf -name: Deploy www.summit.ttm.sh.conf - - copy: + dest: /etc/apache2/sites-available/thunix.tilde.chat.conf + +- name: Deploy www.summit.ttm.sh.conf + copy: src: ../files/etc/apache2/sites-available/www.summit.ttm.sh.conf - dest: /etc/apache2/sites/available/www.summit.ttm.sh.conf -name: Deploy www.summit.ttm.sh-le-ssl.conf - - copy: + dest: /etc/apache2/sites-available/www.summit.ttm.sh.conf + +- name: Deploy www.summit.ttm.sh-le-ssl.conf + copy: src: ../files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf - dest: /etc/apache2/sites/available/www.summit.ttm.sh-le-ssl.conf -name: Deploy www.thunix.cf.conf - - copy: + dest: /etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf + +- name: Deploy www.thunix.cf.conf + copy: src: ../files/etc/apache2/sites-available/www.thunix.cf.conf - dest: /etc/apache2/sites/available/www.thunix.cf.conf -name: Deploy www.thunix.cf-le-ssl.conf - - copy: + dest: /etc/apache2/sites-available/www.thunix.cf.conf + +- name: Deploy www.thunix.cf-le-ssl.conf + copy: src: ../files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf - dest: /etc/apache2/sites/available/www.thunix.cf-le-ssl.conf + dest: /etc/apache2/sites-available/www.thunix.cf-le-ssl.conf diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml index ecfa5a41..134cf8bf 100644 --- a/roles/webserver/tasks/main.yml +++ b/roles/webserver/tasks/main.yml @@ -1,8 +1,7 @@ - --- - # This playbook contains all of the www config - - - include: packages.yml - - include: users.yml - - include: apache.yml - - include: codedeploy.yml +--- +# This playbook contains all of the www config +- include: packages.yml +- include: users.yml +- include: apache.yml +- include: codedeploy.yml diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml index c53fabcd..753abe81 100644 --- a/roles/webserver/tasks/packages.yml +++ b/roles/webserver/tasks/packages.yml @@ -1,25 +1,25 @@ - # Install apache and accoutrements www, irrespective of what role they might have - --- - - name: Install wwww packages - apt: name={{ item }} state=present - with_items: - - apache2 - - mariadb-server - - mariadb-client - - php7.0 - - libapache2-mod-php7.0 - - php7.0-mysql - - php7.0-curl - - php7.0-gd - - php7.0-intl - - php-pear - - php-imagick - - php7.0-imap - - php7.0-mcrypt - - php-memcache - - php7.0-pspell - - php7.0-recode - - php7.0-sqlite3 - - php7.0-tidy - - php7.0-xmlrpc - - php7.0-xsl +# Install apache and accoutrements www, irrespective of what role they might have +--- +- name: Install packages + apt: name={{ item }} state=present + with_items: + - apache2 + - mariadb-server + - mariadb-client + - php7.0 + - libapache2-mod-php7.0 + - php7.0-mysql + - php7.0-curl + - php7.0-gd + - php7.0-intl + - php-pear + - php-imagick + - php7.0-imap + - php7.0-mcrypt + - php-memcache + - php7.0-pspell + - php7.0-recode + - php7.0-sqlite3 + - php7.0-tidy + - php7.0-xmlrpc + - php7.0-xsl diff --git a/roles/webserver/tasks/users.yml b/roles/webserver/tasks/users.yml index 95ed4200..2fc69ead 100644 --- a/roles/webserver/tasks/users.yml +++ b/roles/webserver/tasks/users.yml @@ -6,7 +6,7 @@ - user: name: amcclure - groups: tilde, sudo + groups: sudo state: present skeleton: /etc/skel shell: /bin/bash