cleanup

- removes unneeded links
- fixed spelling errors
- remvoed mcrypt

README.md

@@ -82,7 +82,7 @@ Settings for the sudo user.
 
 Settings for [geerlingguy.certbot](https://github.com/geerlingguy/ansible-role-certbot)
 
-    # For live certs swithch this value
+    # For live certs switch this value
     # certbot_cloudflare_acme_server: "{{ certbot_cloudflare_acme_live }}"
     certbot_cloudflare_acme_server: "{{ certbot_cloudflare_acme_test }}"
     # Email address for Cloudflare Global API Key

roles/logwatch/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
 # Logwatch
-logwatch_send_to: "[email protected]"
-logwatch_send_from: "[email protected]"
+logwatch_send_to: ""
+logwatch_send_from: ""

roles/setup/files/usage.j2

@@ -1,7 +1,6 @@
 #!/bin/bash
 echo -e "## {{ansible_nodename}} Folders\n" > /var/www/sites/web/usage.txt
 du -hd1 /var/www/ | sort -h -r | while read space user ; do echo -e " * $space $user\n"; done >> /var/www/sites/web/usage.txt
-du -hd1 /var/build/ | sort -h -r | while read space user ; do echo -e " * $space $user\n"; done >> /var/www/sites/web/usage.txt
 echo -e "## {{ansible_nodename}} Space\n" >> /var/www/sites/web/usage.txt
 df -Ph / | column -t >> /var/www/sites/web/usage.txt
 echo -e "\n" >> /var/www/sites/web/usage.txt

roles/setup/files/web/index.php.j2

@@ -244,7 +244,6 @@
                         <li><a href="usage.txt">usage.txt</a></li>
                         <li><a href="phpinfo.php">phpinfo.php</a></li>
                         <li><a href="slack.php">Slack Users</a></li>
-                        <li><a href="dad.php">icanhazdadjoke.com</a></li>
                     </ul>
                     <!-- Column four end -->
                 </div>

roles/setup/tasks/main.yml

@@ -89,19 +89,18 @@
       state: directory
       mode: 0775
 
-  - name: Web Server Templates 
+  - name: Web Server Templates
     template:
       src: "{{ item.src }}"
       dest: "{{ item.dest }}"
       owner: "{{user_sudouser_username}}"
       group: www-data
       mode: 0755
     with_items:
-      - { src: 'files/web/dad.php.j2', dest: '/var/www/sites/web/dad.php' }
       - { src: 'files/web/index.php.j2', dest: '/var/www/sites/web/index.php' }
       - { src: 'files/web/phpinfo.php.j2', dest: '/var/www/sites/web/phpinfo.php' }
 
-  - name: web File Templates 
+  - name: web File Templates
     template:
       src: "{{ item.src }}"
       dest: "{{ item.dest }}"

vars/main-vars.sample.yml

@@ -30,8 +30,9 @@ certbot_email: "[email protected]"
 certbot_create_if_missing: yes
 # Install from source to get dns plugin folders
 certbot_install_from_source: yes
-# For live certs, uncoment
+# By Default certbot will use the testing server. For live certs, switch the comments
 # certbot_cloudflare_acme_server: "{{ certbot_cloudflare_acme_live }}"
+certbot_cloudflare_acme_server: "{{ certbot_cloudflare_acme_test }}"
 # Email address for Cloudflare Global API Key
 certbot_cloudflare_email: "[email protected]"
 # ansible-vault encrypt_string 'cloudflareAPIKey' --name 'certbot_cloudflare_api_key'
@@ -67,16 +68,13 @@ setup_servers: "{{ groups['webgroup'] }}"
 ## ansible-vault encrypt_string 'slackAPIKey' --name 'setup_slack_api'
 setup_slack_api: ''
 
-
-
 # Jenkins Playbook
 jenkins_vhost: "demojenkins.example.com"
 jenkins_email: "[email protected]"
 jenkins_admin_username: admin
 # ansible-vault encrypt_string 'demo' --name 'jenkins_admin_password'
 jenkins_admin_password: 'demo'
 
-
 # Logwatch Playbook
 logwatch_send_to: "[email protected]"
 logwatch_send_from: "[email protected]"
@@ -134,7 +132,5 @@ setup_apt_install:
   - sshpass
   - unzip
 
-
-
 ## Pantheon CI https://pantheon.io/docs/guides/jenkins/
 config_terminus_ci: false

vars/ubuntu-7.1.yml

@@ -12,7 +12,6 @@ apache_mods_disabled:
 
 php_packages_extra:
   - libapache2-mod-php7.1
-  - php7.1-mcrypt
   - php7.1-intl
   - php7.1-xsl
   - php7.1-zip

vars/ubuntu-7.2.yml

@@ -12,7 +12,6 @@ apache_mods_disabled:
 
 php_packages_extra:
   - libapache2-mod-php7.2
-  - php7.2-mcrypt
   - php7.2-intl
   - php7.2-xsl
   - php7.2-zip

web.yml

@@ -4,16 +4,16 @@
   gather_facts: false
   pre_tasks:
   - setup: # aka gather_facts
-  # - name: Add domain to CloudFalre
-  #   cloudflare_dns:
-  #     zone: "{{base_web_domain}}"
-  #     record: "*.{{ansible_nodename}}"
-  #     type: A
-  #     value: "{{ ansible_default_ipv4.address }}"
-  #     account_email: "{{ certbot_cloudflare_email }}"
-  #     account_api_token: "{{ certbot_cloudflare_api_key }}"
-  #   register: record
-  # - debug: var=record
+  - name: Add domain to CloudFalre
+    cloudflare_dns:
+      zone: "{{base_web_domain}}"
+      record: "*.{{ansible_nodename}}"
+      type: A
+      value: "{{ ansible_default_ipv4.address }}"
+      account_email: "{{ certbot_cloudflare_email }}"
+      account_api_token: "{{ certbot_cloudflare_api_key }}"
+    register: record
+  - debug: var=record
   - name: set timezone to America/Chicago
     timezone:
       name: America/Chicago