subspace 2.5.10 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19de34c265cd2948a3dc40c63d8974f76e5a4ce63a014eb2fe19db81181cf2ea
-  data.tar.gz: efeab17b834a3e09270c9ae2a94976f635e92eb890ae218324029d11dc139a92
+  metadata.gz: b24a2573b737094142caaf93e8b7380b4f4bf756c611fe81012a9adcc0d8d026
+  data.tar.gz: c0fe4b9c23cf613c28ddf832a4bf67ac48055fcc51a32b1ffe8ebc4ad143d14a
 SHA512:
-  metadata.gz: b1137de151178b6960cf83438b05b0ba674b7918b56387fd1dfc2932647231d2fdb5225dddbdbef47849c84aca0dd6b340124c917396cce4a4022fea31bf0417
-  data.tar.gz: a9a78b1cae0a192319455041009f0bbe0ba1f928262b96c8fe357dd21dc6b4d5557ce375988ce44735cdefedae7d5f83a98573e7d87394b27a1918976786a1fb
+  metadata.gz: a758a05af7793e9f5ee377f1008238678ee94d5fc3d5ff5e03289cb4b1736288e3d829efa36440b3744045358a5340ae4934107fd29a034bda9042b4cfcc9254
+  data.tar.gz: da042e9f7c0f6871ac50bb64c3525ef4ce54bdcebd9ed1b3bdb6d5a8602332dd93551a47f1fda97215c1180d9550e9f87bf0030453c1f9f5d388c3dc944eeaca

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.1.0

data/CHANGELOG.md

@@ -11,16 +11,33 @@ This project attempts to follow [semantic versioning](https://semver.org/).
   * Stops showing color if you `sudo su`
 
 ## Unreleased
-## 2.5.10
-  * Backport the fix for ansible's change of get_url checksum arguments
 
-## 2.5.9
-  * backport disabling mitogen
+## 3.0.0
+  * Install redis from vendor repos (BREAKING, see README)
+  * Removed outdated awscli role
+  * Added `subspace secrets rekey` to generate and rekey ansible-vault secrets
+  * Update tailscale role
+  * Don't default to using pemfile (use tailscale instead!)
+  * Add `subspace inventory keyscan` to fix ssh fingerprints
+  * Use `sidekiq_workers` var in systemd
+  * Tailscale hostname is now {{project_name}}-{{hostname}}
+
+## 3.0.0.rc1
+  * Added infrastructure management via Terraform!
+  * Added new `subspace exec` command for manual remote management
+  * BREAKING: Consolidated inventory file into config/provision/inventory.env.yml
+    * No more hosts file
+    * No more host_vars directory
+    * No more group_vars directory
+    * All of the host/group configuration is in that one file now!
+  * BREAKING: `subspace vars` is now `subspace secrets`
+  * BREAKING: sidekiq_concurrency renamed to sidekiq_workers, default changed from 10 -> 1
+  * BREAKING: swap_space variable must be defined for the `common` ansible role (previously defaulted to 512MB)
+  * BREAKING: removed defaults from rails, postgis, puma roles
 
 ## 2.5.8
   * Add a new role for configuring a monit-based resque server
   * Auto-detect mitogen for speed
-
 ## 2.5.7
   * Add ability to set the timezone for servers instead of forcing to Central Time
   * Update puma configuration to support puma 5 with puma-daemon

data/README.md

@@ -32,13 +32,23 @@ Or install it yourself as:
 
     $ gem install subspace
 
+### Mitogen
+Optionally, you can install a python/pip packaged called "Mitogen" which dramatically speeds up running ansible over ssh.  See [Here](https://github.com/mitogen-hq/mitogen/blob/master/docs/ansible_detailed.rst) for details.
+
+    pip install mitogen
+
+Subspace will try and detect if mitogen is present and use it can.  If mitogen causes problems (sometimes it can cause problems depending on the system versions, and particaularly when brand new versions of anible come up and it hasn't updated), you can disable it:
+
+    DISABLE_MITOGEN=1 subspace provision env
 ## Usage
 
 ### `subspace init`
 
-Initialize the project for subspace. Creates `config/provision` with all
+Initialize the project for subspace. Creates `config/subspace` with all
 necessary files.
 
+Subspace 3 supports terraform.  You will need to create an IAM user manually with administrative access to the target AWS environment for terraform.
+
 ### `subspace bootstrap <environment>`
 
 Ensures the $HOME/.ssh directory is present and ensures python is installed.
@@ -56,7 +66,7 @@ At the time of this writing, we pass through the `ansible-playbook` "tags" and
 "start-at-task" options. The tags option is probably the most useful.
 
 e.g. To run only the alienvault tasks (all of which have been tagged with the
-'alienvault' tag): `subspace provision dev --tags=alienvault`
+'alienvault' tag): `subspace provision staging --tags=alienvault`
 
 ### `subspace maintain <environment>`
 
@@ -91,11 +101,23 @@ common     | authorized\_keys          | updates the authorized\_keys file for t
 rails      | appyml                    |
 monit      | monit                     | All tasks in the monit role have been tagged 'monit'
 
-### `subspace vars <environment> [--edit] [--create]`
+### `subspace secrets <environment> [--edit] [--create]`
+
+The `secrets` command will manage encrypted secrets for different environments.  The default action is simply to show the secrets defined for an environment.  Pass --edit to edit them in the system editor (vim, etc).
+
+This uses `ansible-vault` under the hood and requires a vault password file.  You will need to get the `.vault_pass` from from a teammate out of band (secrets.10fw.ne, 1password, sticky-note, etc), and put it into `config/provision/.vault_pass`
+
+These secrets are used during provisioning to populate variables in a few different places:
+1. `config/application.yml`, which uses the `figaro` gem to manage environment variables in rails.
+2. `config/database.yml`, which handles the database connection password.
+
+
+Subspace uses a template file in `config/provision/templates/application.yml.template` that contains environment variables for all environments.  If you have non-secret variables that change based on the target server, you can simply put that in plaintext in the template file. This was designed so the configuration that is not secret is visible and version controlled, while the secret values are stored in the vault files for their environments.
 
-Manage environment variables on different platforms.  The default action is simply to show the vars defined for an environment.  Pass --edit to edit them in the system editor.
+NOTE: application.yml should be in the `.gitignore`, since subspace creates a new version on the server and symlinks it on top of whatever is checked in. You should make changes to the template file instead, which should be checked in to version control.
 
-The new system uses a file in `config/provision/templates/application.yml.template` that contains environment variables for all environments.  The configuration that is not secret is visible and version controlled, while the secrets are stored in the vault files for their environments. The default file created by `subspace init`  looks like this:
+
+The default template created by `subspace init`  looks like this:
 
 ```
 # These environment variables are applied to all environments, and can be secret or not
@@ -103,13 +125,13 @@ The new system uses a file in `config/provision/templates/application.yml.templa
 # This is secret and can be changed on all three environment easily by using subspace vars <env> --edit
 SECRET_KEY_BASE: {{secret_key_base}}
 
-#This is not secret, and is the same value for all environments
+# This is not secret, and is the same value for all environments
 ENABLE_SOME_FEATURE: false
 
 development:
   INSECURE_VARIABLE: "this isn't secret"
 
-dev:
+staging:
   INSECURE_VARIABLE: "but it changes"
 
 production:
@@ -117,14 +139,12 @@ production:
 
 ```
 
-Further, you can use the extremely command to create a local copy of `config/application.yml`
+You can also use this command to automatically create a local version of `config/application.yml` based on the template and encrypted secrets for a specific environment.
 
-    # Create a local copy of config/application.yml with the secrets encrypted in vars/development.yml
+    # Create a local copy of config/application.yml with the secrets encrypted in secrets/development.yml
     $ subspace vars development --create
 
-This can get you up and running in development securely, the only thing you need to distribute to new team members is the vault password.  Grab it from a teammate and put it into `config/provision/.vault_pass`
-
-NOTE: application.yml should be in the `.gitignore`, since subspace creates a new version on the server and symlinks it on top of whatever is checked in.
+This can get you up and running quickly in development securely.
 
 ## Procedure for updating on projects
 
@@ -136,13 +156,13 @@ Then,
 
 * `subspace provision production`
 
-If you get an error saying you need a vault password file, you should be able to find it in 1Password. You might also need to update `ansible`.
+If you get an error saying you need a vault password file, you need to get it from somoene on the team (see above). You might also need to update `ansible`.
 
-You'll want to do this for each environment (ie: `subspace provision qa`, etc.). Best to start with dev and work your way up.
+You'll want to do this for each environment (ie: `subspace provision qa`, etc.). Best to start with staging and work your way up.
 
 # Host configuration
 
-We need to know some info about hosts, but not much.  See the files for details, it's mostly the hostname and the user that can administer the system, eg `ubuntu` on AWS/ubuntu, `ec2-user`, or even `root` (not recommended)
+We need to know some info about hosts, but not much.  See the files for details, it's mostly the hostname and the user that can administer the system, eg `ubuntu` on AWS/ubuntu, `ec2-user`, or even `root` (not recommended, but used on linode/Digital Ocean)
 
 # Role Configuration
 
@@ -202,8 +222,7 @@ Aside from basic statistics like free memory, disk, load averages, etc, we have
 3. If nginx is installed, it will collect stats from the "status port"
 4. (TODO) add something for pumas
 5. (TODO) add something for sidekiq
-6. (TODO) add something for memcache
-7. If you're using our standard lograge format, you can enable lograge collection which will provide stats on request count and timers (db/view/total)
+6. If you're using our standard lograge format, you can enable lograge collection which will provide stats on request count and timers (db/view/total)
 
     rails_lograge: true
 
@@ -242,20 +261,34 @@ Defaults:
 
 ## letsencrypt
 
-By default, this creates a single certificate for every server alias/server name in the configuration file.
-If you'd like more control over the certs created, you can define the variables `le_ssl_certs` as follows:
+This creates a single certificate for every server alias/server name in the configuration file.
+
+    letsencrypt_email: "me@example.com"
+    server_name: app.example.com
+
+
+If you'd like more control over the cert, you can customize the variable `le_ssl_cert` as follows:
+
+    le_ssl_cert:
+      cert_name: "{{server_name}}"
+      preferred_challenges: "http"
+      plugin: standalone
+      domains: "{{ [server_name] + server_aliases }}"
+
+For example, to force a manual DNS challenge you can do the following:
+
+    le_ssl_cert:
+      cert_name: star_example
+      preferred_challenges: dns
+      plugin: manual
+      domains:
+        - example.com
+        - "*.example.com"
 
-    le_ssl_certs:
-      - cert_name: mycert
-        domains:
-          - mydomain.example.com
-          - otherdomain.example.com
-      - cert_name: othersite
-        domains:
-          - othersite.example.com
+(you will need to futz around the first time and manually install the DNS record, but it should work on renewals)
+
+Note that this role needs to be included _before_ the webserver (apache or nginx) role
 
-Note that this role needs to be included _before_ the webserver (apache or
-nginx) role
 
 ## logrotate
 
@@ -274,18 +307,19 @@ Installs logrotate and lets you configure logs for automatic rotation.  Example
 
 ## memcache
 
-## monit
-
-## mysql
+Installs memcache on the server.  By default, memcache will only listen on localhost which needs to be changed if other servers needs to connect.
 
-## mysql2_gem
+    # Default Value
+    memcache_bind: "127.0.0.1"
 
-## newrelic
+    # bind to all interfaces
+    memcache_bind: "0.0.0.0"
 
 ## newrelic-infra
 This role will install the next-gen "Newrelic One" infrastructure agent which can perform a few different functions for newrelic.  The previous "newrelic" role is deprecated.
 
 Variables:
+
     # Required, the newrelic license key you get after signing up.
     newrelic_license: "longhashthingyougetfromnewrelichere"
     # Optional - send logs to newrelic one's log aggregator.
@@ -328,7 +362,14 @@ Optional variables:
 
 ## nodejs
 
-Used to install recent version of NodeJS. Must set `nodejs_version`. e.g. `nodejs_version: "8.x"`
+Used to install different versions of NodeJS. This uses NodeSource's apt repositories. You must define a variable called `nodejs_version` and choose a major version supported by NodeSource:
+
+    nodejs_version: 14.x
+    nodejs_version: 17.x
+    nodejs_version: lts
+    nodejs_version: current
+
+The full list of distributions is here: https://github.com/nodesource/distributions#installation-instructions
 
 ## papertrail
 
@@ -344,35 +385,49 @@ Used to install recent version of NodeJS. Must set `nodejs_version`. e.g. `nodej
     database_user: "{{project_name}}"
 
 ## puma
+Use the puma app server for your rails app.  Usually combined with nginx to server as a static file server and reverse proxy.
+
+**Prerequesites:**
+  - add `gem puma` to your gemfile
+  - add `config/puma/` to the `linked_dirs` config in capistrano's `deploy.rb`
 
-add puma gem to gemfile
-add config/puma to symlinks in deploy.rb
+This role will generate a reasonable `puma.rb` and configure it to be controlled by systemd.
 
+**Variables:**
+
+    puma_workers: 1        # Puma process count (usually == vCPU count)
+    puma_min_threads: 4    # Min threads/process
+    puma_max_threads: 16   # Max threads/process
 
 ## rails
 
 Provisions for a rails app.  This one is probably pretty important.
 
-Default values (these are usually fine)
+We no longer provider default values, so make sure to define all the following variables:
 
+    rails_env: production
     database_pool: 5
     database_name: "{{project_name}}_{{rails_env}}"
     database_user: "{{project_name}}"
+    database_host: localhost
+    database_adapter: postgresql
+    database_password: # usually defined in the encrypted vault
     job_queues:
       - default
       - mailers
 
-Customize:
-
-    rails_env: [whatever]
-
 ## redis
 
 Installs redis on the server.
 
-    # Change to * if you want tthis available everywhere.
+    # Change to * if you want this available everywhere instead of localhost
     redis_bind: 127.0.0.1
 
+As of Subspace 3.0, this uses the official redis apt repo instead of the debian/ubuntu ones.  If you previously had installed redis from the distro, you will need to manually uninstall, purge, and reinstall.  This should not delete any data but back it up just in case.
+
+    sudo apt-get purge redis-server
+    sudo apt-get install redis-server
+
 ## resque
 
 Install monitoring and automatic startup for resque workers via monit. You MUST set the `job_queues` variable as follows:
@@ -381,12 +436,15 @@ Install monitoring and automatic startup for resque workers via monit. You MUST
       - default
       - mailers
       - exports
+
+    redis_bind: "*"
+
 ## ruby-common
 
 Installs ruby on the machine.  YOu can set a version by picking off the download url and sha hash from ruby-lang.org
 
     ruby_version: ruby-2.4.1
-    ruby_checksum: sha256:a330e10d5cb5e53b3a0078326c5731888bb55e32c4abfeb27d9e7f8e5d000250
+    ruby_checksum: a330e10d5cb5e53b3a0078326c5731888bb55e32c4abfeb27d9e7f8e5d000250
     ruby_download_location: 'https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.1.tar.gz'
     bundler_version: 2.0.1
 
@@ -395,13 +453,13 @@ Installs ruby on the machine.  YOu can set a version by picking off the download
 
 This will install a monit script that keeps sidekiq running.  We spawn one sidekiq instance that manages as many queues as you need.  Varaibles of note:
 
-    # Process these background job queues
+    # Process these queues on this server
     job_queues:
       - default
       - mailers
 
     # Number of sidekiq *processes* to run
-    sidekiq_concurrency: 1
+    sidekiq_workers: 1
 
 * Note that as of v0.4.13, we now also add a unique job queue for each host with its hostname.  This is handy if you need to assign a job to a specific host.  In general you should use named queues, but occasionally this is useful and there's no harm in having it there unused.
 
@@ -425,11 +483,7 @@ In order to dramatically speed up ansible, you can install Mitogen: https://gith
 
     pip install -g mitogen
 
-Subspace will automatically detect this and update your ansible.cfg file so it is blazing fast.  Sometimes this can cause issues with older servers that have weird pythons, so if you have mitogen installed locally but dont wan't to use it, you can set an environment variable:
-
-    DISABLE_MITOGEN=1 subspace provision staging
-
-
+Subspace will automatically detect this and update your ansible.cfg file so it is blazing fast.
 
 
 ## Directory Structure

data/UPGRADING.md

@@ -0,0 +1,10 @@
+# Subspace Upgrade Guide
+
+
+# 2.x -> 3.0
+
+- Run subspace init
+- Someone write subspace upgrade3 please
+
+# 2.x -> 2.y
+We strive to follow semver so upgrading from 2.x to 2.y should be safe.  However, since use of this tool can affect your production infrastructure, we highly recommend reviewing the [CHANGELOG](CHANGELOG.md) when upgrading.

data/ansible/roles/common/defaults/main.yml

@@ -1,5 +1,4 @@
 ---
-  swap_space: 512M
   deploy_user: deploy
   send_stats: false
   timezone: America/Chicago

data/ansible/roles/common/files/sudoers-service

@@ -1 +1 @@
-deploy ALL=(root) NOPASSWD: /usr/bin/systemctl, /usr/sbin/service
+deploy ALL=(root) NOPASSWD: /usr/bin/systemctl, /usr/sbin/service, /bin/systemctl

data/ansible/roles/common/tasks/main.yml

@@ -64,6 +64,14 @@
     tags:
       - maintenance
 
+  - name: apt-get update
+    apt: update_cache=yes cache_valid_time=86400
+    become: true
+    tags:
+      - upgrade
+      - maintenance
+    ignore_errors: yes
+
   - name: install aptitude
     apt:
       pkg: aptitude
@@ -72,12 +80,11 @@
     tags:
       - maintenance
 
-  - name: apt-get update
-    apt: update_cache=yes cache_valid_time=86400
-    become: true
-    tags:
-      - upgrade
-      - maintenance
+  - name: "Ensure systemd is installed"
+    apt:
+      name: systemd
+      state: latest
+      update_cache: yes
 
   - name: Add ppa:ondrej/nginx apt repository for TLS 1.3
     apt_repository:
@@ -276,7 +283,7 @@
 
   - name: Update authorized_keys for deploy user
     copy:
-      src: authorized_keys
+      src: templates/authorized_keys
       dest: "/home/{{deploy_user}}/.ssh/authorized_keys"
       owner: "{{deploy_user}}"
     become: true
@@ -320,3 +327,7 @@
       - stats
 
   - import_tasks: swap.yml
+    when: swap_space is defined
+
+  - import_tasks: no_swap.yml
+    when: swap_space is not defined

data/ansible/roles/common/tasks/no_swap.yml

@@ -0,0 +1,26 @@
+---
+- name: turn off swap
+  become: true
+  command: swapoff -a
+
+- name: set swapiness
+  become: true
+  sysctl:
+    name: vm.swappiness
+    value: "0"
+
+- name: delete swap file
+  become: true
+  file:
+    path: /swapfile
+    state: absent
+
+- name: remove from fstab
+  become: true
+  lineinfile:
+    dest: /etc/fstab
+    regexp: /swapfile
+    line: "/swapfile none swap sw 0 0"
+    state: absent
+
+

data/ansible/roles/common/templates/motd

@@ -8,6 +8,6 @@ This server brought to you by:
 ~~~ https://github.com/tenforwardconsulting/subspace ~~~
 
 If you need to make configuration changes to the server, please modify the
-config/provision directory in the app or risk the changes disappearing.
+config/subspace directory in the app or risk the changes disappearing.
 
 Last subspace run: {{ansible_date_time.iso8601}}

data/ansible/roles/common/templates/motd2

@@ -21,4 +21,4 @@
  https://github.com/tenforwardconsulting/subspace
 
 If you need to make configuration changes to the server, please modify the
-config/provision directory in the app or risk the changes dissapearing.
+config/subspace directory in the app or risk the changes dissapearing.

data/ansible/roles/delayed_job/tasks/main.yml

@@ -1,45 +1,28 @@
 ---
   - set_fact: delayed_job_installed="true"
 
-  - name: Monit Stop All
-    shell: monit stop all
+  - name: Install systemd delayed_job script
     become: true
-    ignore_errors: yes
-
-  - name: Wait for monit to stop
-    shell: monit status | grep Monitored | wc -l | awk '{print $1 $2}'
-    register: monit_stopped
-    retries: 10
-    until: monit_stopped.stdout == "0"
-    delay: 10
-    become: true
-
-  - name: Install delayed_job monit script
+    vars:
+      job_queue: "{{ item }}"
+      loop_index: "{{ loop_index }}"
     template:
-      src: delayed-job-monit-rc
-      dest: /etc/monit/conf.d/delayed_job_{{project_name}}_{{rails_env}}
+      src: delayed-job-systemd.service
+      dest: /etc/systemd/system/delayed_job_{{ item }}{{ loop_index }}.service
+    loop: "{{ job_queues }}"
+    loop_control:
+      index_var: loop_index
+      loop_var: item
+
+  - name: Enable systemd delayed_job service
     become: true
+    systemd:
+      name: "delayed_job_{{ item }}{{ loop_index }}"
+      daemon_reload: true
+      enabled: yes
+      state: started
+    loop: "{{ job_queues }}"
+    loop_control:
+      loop_var: item
+      index_var: loop_index
 
-  - name: Remove old upstart files
-    file:
-      path: /etc/init/delayed-job.conf
-      state: absent
-    become: true
-
-  - name: Remove old monit files
-    file:
-      path: /etc/monit/conf.d/delayed_job
-      state: absent
-    become: true
-
-  - name: reload_monit
-    shell: monit reload
-    become: true
-
-  - name: wait
-    pause:
-      seconds: 3
-
-  - name: restart_monit
-    shell: monit restart all
-    become: true

data/ansible/roles/delayed_job/templates/delayed-job-systemd.service

@@ -0,0 +1,33 @@
+[Unit]
+Description=Start delayed_job_{{job_queue}}{{loop_index}} instance
+After=syslog.target network.target
+
+[Service]
+Type=simple
+
+# Uncomment this if you are going to use this as a system service
+# if using as a user service then leave commented out, or you will get an error trying to start the service
+# !!! Change this to your deploy user account if you are using this as a system service !!!
+User=deploy
+Group=deploy
+UMask=0002
+
+Environment=RAILS_ENV={{rails_env}}
+
+WorkingDirectory=/u/apps/{{project_name}}/current
+ExecStart=/usr/local/bin/bundle exec {{delayed_job_command}} --identifier={{job_queue}}{{loop_index}} --queue={{job_queue}} start
+ExecStop=/usr/local/bin/bundle exec {{delayed_job_command}} --identifier={{job_queue}}{{loop_index}} --queue={{job_queue}} stop
+TimeoutSec=120
+PIDFile=/u/apps/{{project_name}}/shared/tmp/pids/delayed_job_{{job_queue}}{{loop_index}}.pid
+
+# if we crash, restart
+RestartSec=1
+Restart=on-failure
+
+StandardOutput=syslog
+StandardError=syslog
+# This will default to "bundler" if we don't specify it
+SyslogIdentifier=delayed_job
+
+[Install]
+WantedBy=multi-user.target

data/ansible/roles/letsencrypt/defaults/main.yml

@@ -1,12 +1,12 @@
 ---
   certbot_dir: "/opt/certbot"
-  apache_ssl_config: |
-    SSLCertificateFile /etc/letsencrypt/live/{{server_name}}/cert.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/{{server_name}}/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
-    SSLCertificateChainFile /etc/letsencrypt/live/{{server_name}}/chain.pem
+  le_ssl_cert:
+    cert_name: "{{server_name}}"
+    preferred_challenges: "http"
+    plugin: standalone
+    domains: "{{ [server_name] + server_aliases }}"
 
   nginx_ssl_config: |
-    ssl_certificate /etc/letsencrypt/live/{{server_name}}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/{{server_name}}/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/{{le_ssl_cert.cert_name}}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/{{le_ssl_cert.cert_name}}/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;

data/ansible/roles/letsencrypt/tasks/main.yml

@@ -41,15 +41,25 @@
       delay: 1
       state: stopped
 
-  - name: Run default
-    when: le_ssl_certs is not defined
+  - name: Generate SSL Certificate
     become: true
-    command: "{{certbot_bin}} certonly --email {{letsencrypt_email}} --domains {{([server_name] + server_aliases) | join(',')}} --cert-name {{server_name}} --standalone --agree-tos --expand --non-interactive"
-
-  - name: Generate SSL Certificates
-    become: true
-    with_items: "{{le_ssl_certs|default([])}}"
-    command: "{{certbot_bin}} certonly --email {{letsencrypt_email}} --domains {{item.domains | join(',')}} --cert-name {{item.cert_name}} --standalone --agree-tos --expand --non-interactive"
+    command:
+      argv:
+        - "{{ certbot_bin }}"
+        - certonly
+        - "--email"
+        - "{{ letsencrypt_email }}"
+        - "--domains"
+        - "{{ le_ssl_cert.domains | join(',') }}"
+        - "--preferred-challenges"
+        - "{{ le_ssl_cert.preferred_challenges }}"
+        - "--cert-name"
+        - "{{ le_ssl_cert.cert_name }}"
+        - "--{{ le_ssl_cert.plugin }}"
+        - "--manual-auth-hook=/bin/yes"
+        - "--agree-tos"
+        - "--expand"
+        - "--non-interactive"
 
   - name: Update nginx default options
     when: "'nginx' in role_names"
@@ -57,12 +67,6 @@
       url: https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf
       dest: /etc/letsencrypt/options-ssl-nginx.conf
 
-  - name: Update apache default options
-    when: "'apache' in role_names"
-    get_url:
-      url: https://raw.githubusercontent.com/certbot/certbot/master/certbot-apache/certbot_apache/options-ssl-apache.conf
-      dest: /etc/letsencrypt/options-ssl-apache.conf
-
   - name: start webserver after standalone mode
     debug: msg="Startup webserver"
     notify: start webserver
@@ -74,16 +78,6 @@
       env: yes
       job: /usr/bin:/bin:/usr/sbin
 
-  - name: Setup cron job to auto renew
-    become: true
-    when: "'apache' in role_names"
-    cron:
-      name: Auto-renew SSL
-      job: "{{certbot_bin}} renew --no-self-upgrade --apache >> /var/log/cron.log 2>&1"
-      hour: "0"
-      minute: "33"
-      state: present
-
   - name: Setup cron job to auto renew
     become: true
     when: "'nginx' in role_names"