.gitlab-ci.yml

@@ -20,14 +20,15 @@ variables:
 
 
 stages:
-  - check_and_lint
+  - check_versions
+  - lint_playbook
   - test_deploy
 
 
 ### BEGIN TEMPLATES ###
 .tags_template: &tags_template
   tags:
-    - zen-ci-deb
+    - zen-ci-deb-workstation
 
 
 .zen_ci_deb_template: &zen_ci_deb_template
@@ -37,7 +38,7 @@ stages:
 
 .check_version_template: &check_version_template
   <<: *tags_template
-  stage: check_and_lint
+  stage: check_versions
   script:
     - /bin/hostname
     - chmod 755 ${ANSIBLE_PLAY_PATH}
@@ -48,7 +49,7 @@ stages:
 
 .lint_playbook_template: &lint_playbook_template
   <<: *tags_template
-  stage: check_and_lint
+  stage: lint_playbook
   script:
     - chmod 755 ${ANSIBLE_PLAY_PATH}
     - ansible-lint -v ${ANSIBLE_PLAY_PATH}/*.yml
@@ -63,6 +64,7 @@ stages:
     - ls -ltr
     - ansible-galaxy install -r roles/requirements.yml
     - ansible-playbook -v -i '127.0.0.1,' --connection=local ${ANSIBLE_EXTRA_VARS} ${ANSIBLE_PLAY}
+    - git clone git@gitlab.thezengarden.net:zen/le-ssl-certs.git /etc/nginx/ssl
     - /bin/ls -l /etc/nginx/conf.d
     - /bin/ls -l /etc/nginx/ssl/*
     - /usr/sbin/nginx -c /etc/nginx/nginx.conf -t

ansible.cfg

@@ -1,23 +1,13 @@
 [defaults]
-inventory               = /home/chris/Development/Ansible/Inventory/ZENventory/zen_inventory.yml
+inventory = inventory/hosts
-roles_path              = /home/chris/Development/Ansible/Roles
+# roles_path = roles/
-remote_tmp              = /tmp/.ansible-${USER}/tmp
+remote_tmp = /tmp/.ansible-${USER}/tmp
-gathering               = smart
+gathering = smart
-gather_timeout          = 30
+gather_timeout = 30
-fact_path               = /home/chris/Development/Ansible
+fact_caching = jsonfile
-fact_caching_connection = /home/chris/Development/Ansible
+fact_caching_connection = facts.d
-fact_caching            = jsonfile
+fact_caching_timeout = 600
-fact_caching_timeout    = 1800
+retry_files_enabled = False
-retry_files_enabled     = False
+forks = 8
-forks                   = 15
+timeout = 30
-timeout                 = 30
+host_key_checking = False
-host_key_checking       = False
-display_skipped_hosts   = False
-interpreter_python      = auto_silent
-bin_ansible_callbacks   = true
-callback_enabled        = yaml, timer, profile_tasks, profile_roles
-
-
-[ssh_connection]
-pipelining = True
-ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey

deploy_proxy_sites.yml

@@ -1,8 +1,8 @@
 ---
-- name: Deploy reverse proxy configuration
+- hosts: all
-  hosts: all
+  become: yes
-  become: true
+  gather_facts: yes
-  gather_facts: true
+
 
   roles:
     - role: zen_rev_proxy