Add variable for acme server.

michaelpporter · Sep 29, 2018 · 8224ea6 · 8224ea6
1 parent 02308b1
commit 8224ea6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/jenkins.yml b/jenkins.yml
@@ -4,8 +4,6 @@
   gather_facts: false
   pre_tasks:
   - setup: # aka gather_facts
-  - import_playbook: setup.yml
-    ignore_errors: yes
   # - name: Add domain to CloudFalre
   #   cloudflare_dns:
   #     zone: "{{base_web_domain}}"
@@ -30,6 +28,7 @@
     - vars/main-vars.yml
 
   roles:
+    - users
     - geerlingguy.git
     - andrewrothstein.hub
     - geerlingguy.postfix

diff --git a/vars/main-vars.sample.yml b/vars/main-vars.sample.yml
@@ -50,7 +50,8 @@ 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
+# certbot_cloudflare_acme_server: "{{ certbot_cloudflare_acme_live }}"
 # Email address for Cloudflare Global API Key
 certbot_cloudflare_email: "[email protected]"
 # ansible-vault encrypt_string 'cloudflareAPIKey' --name 'certbot_cloudflare_api_key'

diff --git a/web.yml b/web.yml
@@ -4,8 +4,6 @@
   gather_facts: false
   pre_tasks:
   - setup: # aka gather_facts
-  - import_playbook: setup.yml
-    ignore_errors: yes
   # - name: Add domain to CloudFalre
   #   cloudflare_dns:
   #     zone: "{{base_web_domain}}"
@@ -30,14 +28,14 @@
     - vars/main-vars.yml
 
   roles:
+    - users
     - geerlingguy.git
     - andrewrothstein.hub
     - geerlingguy.postfix
     - role: oefenweb.swapfile
       check_mode: no
     - setup
     - michaelpporter.certbot_cloudflare
-    - pedrocarmona.github-git-lfs
     - geerlingguy.apache
     - geerlingguy.php-versions
     - geerlingguy.php