taperole 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b15707ed1842c5ad02b43a131ec2d11b8fd08fc
-  data.tar.gz: aaf7a59cee5519c395d0588541489582b9e7661f
+  metadata.gz: 04c8ed5420729d25e87791048c01bb0f682c444f
+  data.tar.gz: a0432626ee02d79e36669df0374905710b56c4af
 SHA512:
-  metadata.gz: 1900fdc9620dc002b61ebe92c4324f1bd604fa13356ed34ca59dc0e675bb4e8c4d9e09eebaac66b6ff77dbd7acac89b134c5327a2cff74e6c6cce3c833220b51
-  data.tar.gz: 37d642680a02f9117dbbc7e666df7d138b7e99292bf172fc89c0492cd23506859b7bfd24aa5244a835e81c732663caa015bea1df74f9e01f95e855b806a3e807
+  metadata.gz: c74dee23fdb912f399a26fd1ad5002aaef27b9bb1c66cf9305c99514d9bc921c7d4589a2e88c0ab1e83a00e179802562d754c3d1857239ebdfb6b5b16d9e72e7
+  data.tar.gz: 7fb79c490b14c6c68f5b3a5f47866a1f3f23f45524bdc0007c36effc6ed530bf5a0bdd3ccd3edc2fe7e63ef9422e37455ef6d054b9a049cfaf4075da70d924fc

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.8.0
+* Updates to multiple Ansible galaxy roles
+* Support for deploying a specific branch
+* Adds support for the ruby gem whenever
+* Remove all Ansible tags from roles
+* Removes imagemagick as a default install on all rails servers
+* Move deployment keys setup into a separate role that can be run on every deploy
+* Only create dhparam if it does not already exist
+
 ### 1.6.0
 * Added Hound
 * Documentation Updates

data/README.md

@@ -124,15 +124,15 @@ You can specify a port using the `ansible_ssh_port` in your hosts inventory file
 **Test Rails**
 
 2. `docker build -f test/rails/Dockerfile -t tapetest .`
-3. `docker run -i -t $(docker images -q imagetest) /start_rails.sh | grep "Hello"`
+3. `docker run -i -t $(docker images -q tapetest) /start_rails.sh | grep "Hello"`
 
 If the last command resulted in a `<h1>Hello</h1>` then your Rails application deployed successfully!
 
 ## Development
 
 ```sh
-git clone git@github.com:smashingboxes/tape.git
-cd tape
+git clone git@github.com:smashingboxes/taperole.git
+cd taperole
 ansible-galaxy install -r requirements.yml --force
 ```
 
@@ -156,7 +156,7 @@ gem 'taperole', '~>1.7'
 
 ```
 
-Note: You can also `$ gem install taperole` and not put Taperole in your 
+Note: You can also `$ gem install taperole` and not put Taperole in your
 Gemfile.
 
 During your first deploy, your app will not have a `secrets.yml` file configured, and Tape will prompt you to provide one:

data/Vagrantfile

@@ -6,10 +6,10 @@ Vagrant.configure 2 do |config|
 
   name = %x[basename `git rev-parse --show-toplevel`].chomp.gsub(/[^0-9a-z ]/i, '')
   config.vm.define "#{name}_vagrant_box"
-  config.vm.hostname = "#{name}"
+  config.vm.hostname = name
 
   private_ip = "192.168.13.37"
-  config.vm.network(:private_network, :ip => private_ip)
+  config.vm.network(:private_network, ip: private_ip)
 
   config.vm.network 'forwarded_port', guest: 443, host: 8080
   config.vm.network 'private_network', type: 'dhcp'

data/lib/taperole/commands/ansible.rb

@@ -32,6 +32,10 @@ module Taperole
                    aliases: :r,
                    type: :string,
                    desc: 'Name of the role to operate on'
+      class_option :extras,
+                   aliases: :e,
+                   type: :string,
+                   desc: 'Extra variables to be passed into ansible'
 
       class_option :'ask-vault-pass', type: :boolean, desc: 'Ask for Ansible vault password'
 
@@ -49,7 +53,7 @@ module Taperole
       desc 'deploy', 'Deploy the latest version of the app'
       def deploy
         Taperole::Notifier.register_notifiers(options)
-        ansible_deploy(args: '-t be_deploy,fe_deploy', options: options)
+        ansible_deploy(options: options)
       end
     end
   end

data/lib/taperole/core/ansible_runner.rb

@@ -47,7 +47,7 @@ module Taperole
       enforce_roles_path!
       cmd = "ANSIBLE_CONFIG=#{local_dir}/.tape/ansible.cfg ansible-playbook -i"
       cmd += " #{inventory_file(options)} #{playbook} #{args} #{hosts_flag(options)}"
-      cmd += " -e tape_dir=#{tape_dir}"
+      cmd += " -e \"#{extra_vars(options)}\""
       cmd += ' --ask-vault-pass' if options['ask-vault-pass']
       cmd += ' -vvvv' if options[:verbose]
       cmd += " -t #{options[:tags]}" if options[:tags]
@@ -74,6 +74,17 @@ module Taperole
       end
     end
 
+    def extra_vars(options)
+      base_vars = "tape_dir=#{tape_dir}"
+      extra_vars = options[:extras]
+
+      if extra_vars
+        base_vars + " " + extra_vars
+      else
+        base_vars
+      end
+    end
+
     def hosts_flag(options)
       limit = options[:limit]
       "-l #{limit}" if limit

data/lib/taperole/version.rb

@@ -1,3 +1,3 @@
 module Taperole
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/roles/backend_checkout/tasks/main.yml

@@ -1,7 +1,6 @@
 - name: Check if path exists
   stat: path={{ be_app_path }}
   register: be_app_path_stat
-  tags: [be_deploy]
 
 - name: Check if there are commited changes on {{ be_app_branch }}
   remote_user: "{{ deployer_user.name }}"
@@ -10,12 +9,10 @@
     chdir: "{{be_app_path}}"
   register: changes_on_remote
   when: be_app_path_stat.stat.exists
-  tags: [be_deploy]
 
 - name: Inform User if there are no changes
   debug: msg={{no_changes_found_error.split('\n')}}
   when: be_app_path_stat.stat.exists and changes_on_remote.stdout_lines == []
-  tags: [be_deploy]
 
 - name: Check out application
   sudo: false
@@ -26,7 +23,6 @@
        accept_hostkey=true
        force=yes
   register: app_checkout
-  tags: [be_deploy]
 
 - name: check that secrets is ignored
   shell: cat {{ be_app_path }}/.gitignore | grep {{ item }}
@@ -34,9 +30,7 @@
     - config/secrets.yml
   register: secrets_ignore_check
   ignore_errors: true
-  tags: [be_deploy]
 
 - name: ignore secrets
   shell: /bin/bash -c 'echo "config/secrets.yml" > {{ be_app_path }}/.git/info/exclude'
   when: secrets_ignore_check|failed
-  tags: [be_deploy]

data/roles/backend_config/tasks/main.yml

@@ -8,17 +8,14 @@
   command: chdir={{ be_app_path }}
            bash -lc "RAILS_ENV={{be_app_env}} bundle install
            --without test development --no-binstubs --deployment"
-  tags: [be_deploy, bundle]
 
 - name: Ensure secrets.yml file present
   stat: path={{ be_app_path }}/config/secrets.yml
   register: secrets_file
-  tags: [be_deploy]
 
 - name: Ask for secrets.yml
   debug: msg="You've got to upload secrets.yml to {{be_app_path}}/config to continue"
   when: secrets_file.stat.exists != true
-  tags: [be_deploy]
 
 - name: Wait one day for secrets.yml to get put on the server
   wait_for: path={{be_app_path}}/config/secrets.yml state=present timeout=86400
@@ -28,5 +25,4 @@
   remote_user: "{{ deployer_user.name }}"
   command: chdir={{ be_app_path }}
            bash -lc "bundle exec rake assets:precompile RAILS_ENV={{be_app_env}}"
-  tags: [precompile_assets,be_deploy]
   when: precompile_assets

data/roles/backend_install_essentials/tasks/main.yml

@@ -3,13 +3,6 @@
             dest=/etc/gemrc
             mode=u=rw,g=r,o=r
 
-- name: Install imagemagick
-  apt: name={{ item }} state=present
-  with_items:
-    - imagemagick
-    - libmagickcore-dev
-    - libmagickwand-dev
-
 - name: Register monit memcached config files
   template: src=memcached.j2
             dest=/etc/monit/conf.d/memcached

data/roles/database_load/defaults/main.yml

@@ -1,3 +1,2 @@
 rake:
-  force_seed: false
   force_migrate: false

data/roles/database_load/tasks/db_reset.yml

@@ -1,14 +1,17 @@
-- name: stop everything
-  command: bash -lc "monit stop all"
+- name: Confirm Reset
+  pause: prompt='About to destroy and reseed the database. Press any key to continue or Ctrl+c and then "a" to abort'
+
+- name: Stop all Services
+  command: bash -lc "sudo monit stop all"
 
 - name: Reset DB
   command: chdir={{ be_app_path }}
-           bash -lc "bundle exec rake db:drop db:create RAILS_ENV={{be_app_env}}"
+           bash -lc "bundle exec rake db:drop db:setup RAILS_ENV={{be_app_env}}"
   register: db_reset
 
 - name: DB Reset Failed
   fail: msg="{{db_reset.stderr}}"
   when: db_reset.stderr
 
-- name: start unicorns
-  command: bash -lc "monit start all"
+- name: Restart Services
+  command: bash -lc "sudo monit start all"

data/roles/database_load/tasks/main.yml

@@ -1,12 +1,10 @@
 - include: db_reset.yml
   when: force_db_reset is defined and force_db_reset
-  tags: [db_reset]
 
 - name: Migrate DB
   remote_user: "{{ deployer_user.name }}"
   command: chdir={{ be_app_path }}
            bash -lc "bundle exec rake db:migrate RAILS_ENV={{be_app_env}}"
-  tags: [be_deploy,migrate,db_reset]
   when: (app_checkout is defined and app_checkout.changed)
         or rake.force_migrate 
         or (db_reset is defined and db_reset.changed)

data/roles/delayed_job/tasks/main.yml

@@ -1,9 +1,7 @@
 - name: Stop Delayed Job
   remote_user: "{{ deployer_user.name }}"
   command: bash -lc "cd {{be_app_path}} && RAILS_ENV={{be_app_env}} bin/delayed_job stop -n {{dj_runners}}"
-  tags: [be_deploy]
 
 - name: Start Delayed Job
   remote_user: "{{ deployer_user.name }}"
   command: bash -lc "cd {{be_app_path}} && RAILS_ENV={{be_app_env}} bin/delayed_job start -n {{dj_runners}}"
-  tags: [be_deploy]

data/roles/deployer_user/tasks/keys.yml

@@ -14,10 +14,3 @@
     owner={{ deployer_user.name }}
     group=users
     mode=600
-
-- name: Ensure devs keys are present
-  authorized_key: key="{{ lookup('file', item) }}"
-    user={{ deployer_user.name }}
-    state=present
-  with_fileglob:
-    - "{{ playbook_dir }}/../dev_keys/*"

data/roles/dev_keys/tasks/main.yml

@@ -0,0 +1,6 @@
+- name: Ensure developer keys are present in deployer's ssh keys
+  authorized_key: key="{{ lookup('file', item) }}"
+    user={{ deployer_user.name }}
+    state=present
+  with_fileglob:
+    - "{{ playbook_dir }}/../dev_keys/*"

data/roles/frontend_deploy/tasks/main.yml

@@ -1,7 +1,6 @@
 - name: Check if path exists
   stat: path={{ fe_app_path }}
   register: fe_app_path_stat
-  tags: [fe_deploy]
 
 - name: Check if there are commited changes on {{ fe_app_branch }}
   remote_user: "{{ deployer_user.name }}"
@@ -10,12 +9,10 @@
     chdir: "{{fe_app_path}}"
   register: changes_on_remote
   when: fe_app_path_stat.stat.exists
-  tags: [fe_deploy]
 
 - name: Inform User if there are no changes
   debug: msg={{no_changes_found_error.split('\n')}}
   when: fe_app_path_stat.stat.exists and changes_on_remote.stdout_lines == []
-  tags: [fe_deploy]
 
 - name: clone the FE app
   when: fe_app_repo is defined
@@ -25,39 +22,33 @@
        version={{ fe_app_branch }}
        accept_hostkey=true
        force=yes
-  tags: [fe_deploy]
 
 - name: Detect package.json
   command: chdir={{ fe_app_path }}
     bash -lc 'test -e package.json'
   register: npm_result
   ignore_errors: true
-  tags: [fe_deploy]
 
 - name: NPM install
   when: fe_app_repo is defined and npm_result|success
   remote_user: "{{ deployer_user.name }}"
   command: chdir={{ fe_app_path }}
     bash -lc 'npm install'
-  tags: [fe_deploy]
 
 - name: Detect bower.json
   command: chdir={{ fe_app_path }}
     bash -lc 'test -e bower.json'
   register: bower_result
   ignore_errors: true
-  tags: [fe_deploy]
 
 - name: Bower install
   when: fe_app_repo is defined and bower_result|success
   remote_user: "{{ deployer_user.name }}"
   command: chdir={{ fe_app_path }} 
     bash -lc 'bower install'
-  tags: [fe_deploy]
 
 - name: Build FE
   when: fe_app_repo is defined
   remote_user: "{{ deployer_user.name }}"
   command: chdir={{ fe_app_path }}
     bash -lc '{{ fe_build_command }}'
-  tags: [fe_deploy]

data/roles/general/tasks/main.yml

@@ -1,16 +1,13 @@
 - name: Ensure repo is defined
   fail: msg="App Repo is not defined. Please define it in {{ tapefiles_dir }}/tape_vars.yml"
   when: (be_app_repo is undefined or be_app_repo is none) and (fe_app_repo is undefined or fe_app_repo is none)
-  tags: [be_deploy]
 
 - name: Ensure app name is defined
   fail: msg="app_name is not defined. Please define it in {{ tapefiles_dir }}/tape_vars.yml"
   when: app_name is undefined or app_name is none
-  tags: [be_deploy]
 
 - name: apt-get update upgrade
   apt: update_cache=yes  upgrade=safe
-  tags: [update, upgrade]
 
 - include: basic_packages.yml
 - include: swapfile.yml

data/roles/imagemagick/tasks/main.yml

@@ -0,0 +1,6 @@
+- name: Install imagemagick
+  apt: name={{ item }} state=present
+  with_items:
+    - imagemagick
+    - libmagickcore-dev
+    - libmagickwand-dev

data/roles/nginx/tasks/main.yml

@@ -1,35 +1,29 @@
 - name: Enable nginx PPA
   apt_repository: repo=ppa:nginx/stable
-  tags: [nginx]
 
 - name: Install nginx
   apt: name=nginx state=present
-  tags: [nginx]
 
 - name: Ditch default nginx site enabled
   file: path=/etc/nginx/sites-enabled/default state=absent
-  tags: [nginx]
 
 - name: Create /etc/nginx/ssl
   file: path=/etc/nginx/ssl state=directory
-  tags: [nginx]
 
 - name: Create self signed SSL cert/key
   command: bash -lc "openssl req -x509 -sha256 -nodes -newkey rsa:2048 -keyout self-signed.key -out self-signed.crt -subj '/CN=localhost'"
   args:
     chdir: /etc/nginx/ssl
     creates: /etc/nginx/ssl/self-signed.*
-  tags: [nginx]
+
+- stat: path=/etc/nginx/ssl/dhparam.pem
+  register: dhparam
 
 - name: Create Diffie Hellman Ephemeral Parameters (this will take some time)
-  command: bash -lc "openssl dhparam -out dhparam.pem 2048" creates=/etc/nginx/ssl/dhparam.pem
-  args:
-    chdir: /etc/nginx/ssl
-  tags: [nginx]
+  command: bash -lc "openssl dhparam -out /etc/nginx/ssl/dhparam.pem 2048" creates=/etc/nginx/ssl/dhparam.pem
 
 - name: Configure App nginx
   template: src=nginx_unicorn.j2 dest=/etc/nginx/sites-enabled/{{ app_name }}
-  tags: [nginx]
 
 - name: Install monit nginx config
   file: src=/etc/monit/conf-available/nginx dest=/etc/monit/conf-enabled/nginx owner=root group=root state=link
@@ -41,9 +35,7 @@
 
 - name: Stop nginx
   service: name=nginx state=stopped
-  tags: [restart_nginx]
 
 - name: Start nginx
   remote_user: "{{ deployer_user.name }}"
   command: bash -lc "sudo monit start nginx"
-  tags: [restart_nginx]

data/roles/ruby/tasks/apt_build_depends.yml

@@ -1,8 +1,6 @@
 - name: update apt cache
   apt: update_cache=yes
   become: true
-  tags:
-    - rbenv
 
 - name: install build depends
   apt: pkg={{ item }} state=present install_recommends=no
@@ -17,5 +15,3 @@
     - libxslt1-dev
     - zlib1g-dev
   become: true
-  tags:
-    - rbenv

data/roles/ruby/tasks/main.yml

@@ -17,15 +17,11 @@
     accept_hostkey=yes
     force=yes
   when: rbenv.env == "system"
-  tags:
-    - rbenv
 
 - name: create plugins directory for system
   remote_user: '{{ rbenv_owner }}'
   file: state=directory path={{ rbenv_root }}/plugins
   when: rbenv.env == "system"
-  tags:
-    - rbenv
 
 - name: install plugins for system
   remote_user: '{{ rbenv_owner }}'
@@ -34,8 +30,6 @@
     dest={{ rbenv_root }}/plugins/ruby-build
     accept_hostkey=yes
     force=yes
-  tags:
-    - rbenv
 
 - name: Set group ownership of content under rbenv_root
   shell:
@@ -50,8 +44,6 @@
     - rbenv_group != None
   register: rbenv_chgrp
   changed_when: '"changed group" in rbenv_chgrp.stdout'
-  tags:
-    - rbenv
 
 - name: Set group permissions of content under rbenv_root
   shell:
@@ -65,15 +57,11 @@
     - rbenv_group != None
   register: rbenv_chmod
   changed_when: '"changed from" in rbenv_chmod.stdout'
-  tags:
-    - rbenv
 
 - name: add rbenv initialization to profile system-wide
   template: src=rbenv.sh.j2 dest=/etc/profile.d/rbenv.sh owner=root group=root mode=0755
   when:
     - ansible_os_family != 'OpenBSD'
-  tags:
-    - rbenv
 
 - name: check ruby {{ rbenv.ruby_version }} installed for system
   shell: $SHELL -lc "rbenv versions | grep {{ rbenv.ruby_version }}"
@@ -82,16 +70,12 @@
   ignore_errors: yes
   always_run: yes
   when: rbenv.env == "system"
-  tags:
-    - rbenv
 
 - name: install ruby {{ rbenv.ruby_version }} for system
   shell: bash -lc "rbenv install {{ rbenv.ruby_version }}"
   when:
     - rbenv.env == "system"
     - ruby_installed.rc != 0
-  tags:
-    - rbenv
 
 - name: check if current system ruby version is {{ rbenv.ruby_version }}
   shell: $SHELL -lc "rbenv version | cut -d ' ' -f 1 | grep -Fx '{{ rbenv.ruby_version }}'"
@@ -100,13 +84,9 @@
   ignore_errors: yes
   always_run: yes
   when: rbenv.env == "system"
-  tags:
-    - rbenv
 
 - name: set ruby {{ rbenv.ruby_version }} for system
   shell: bash -lc "rbenv global {{ rbenv.ruby_version }} && rbenv rehash"
   when:
     - rbenv.env == "system"
     - ruby_selected.rc != 0
-  tags:
-    - rbenv

data/roles/sidekiq/tasks/main.yml

@@ -11,9 +11,7 @@
 - name: Stop sidekiq
   remote_user: "{{deployer_user.name}}"
   command: bash -lc "sudo monit stop sidekiq"
-  tags: [be_deploy, unicorn_stop]
 
 - name: Start sidekiq
   remote_user: "{{deployer_user.name}}"
   command: bash -lc "sudo monit start sidekiq"
-  tags: [be_deploy, unicorn_start]

data/roles/unicorn_activate/tasks/main.yml

@@ -2,19 +2,15 @@
   remote_user: "{{ deployer_user.name }}"
   command: bash -lc "sudo monit restart unicorn"
   when: kill_unicorn
-  tags: [unicorn_stop]
 
 - name: Force stop unicorn
   remote_user: "{{ deployer_user.name }}"
   command: bash -lc "service unicorn_{{ app_name }} stop"
   when: kill_unicorn
-  tags: [unicorn_force_stop]
 
 - name: Ensure tmp dir present for unicorn pids
   file: state=directory path={{be_app_path}}/tmp/unicorn owner={{ deployer_user.name }}
-  tags: [be_deploy]
 
 - name: Restart Unicorn
   remote_user: "{{ deployer_user.name }}"
   command: bash -lc "sudo monit restart unicorn"
-  tags: [unicorn_restart,be_deploy]

data/roles/whenever/tasks/main.yml

@@ -0,0 +1,4 @@
+- name: Wheneverize
+  remote_user: "{{ deployer_user.name }}"
+  command: chdir={{ be_app_path }}
+           bash -lc bundle exec whenever --update-crontab --set environment={{be_app_env}}"

data/templates/base/deploy.example.yml

@@ -8,10 +8,11 @@
   user: "{{ deployer_user.name }}"
 
   roles:
-    - deployer_user
+    - dev_keys
     - backend_checkout
     - backend_config
     - database_load
     - unicorn_activate
     - frontend_deploy
     # - delayed_job
+    # - whenever

data/templates/base/omnibox.example.yml

@@ -25,6 +25,7 @@
     - general
     - ufw
     - deployer_user
+    - dev_keys
     - monit_install
     - postgres
     - nginx
@@ -37,6 +38,8 @@
     - unicorn_activate
     - frontend_deploy
     # - delayed_job
+    # - whenever
     # - sidekiq
     # - redis
+    # - imagemagick
     - monit_activate # Run Last

data/vendor/ANXS.postgresql/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Sep 28 17:15:22 2016', version: v1.5.0}
+{install_date: 'Thu Jan  5 14:34:14 2017', version: v1.6.2}

data/vendor/ANXS.postgresql/tasks/extensions/postgis.yml

@@ -9,6 +9,6 @@
   with_items:
     - libgeos-c1
     - "postgresql-{{postgresql_version}}-postgis-{{postgresql_ext_postgis_version}}"
-    - "postgresql-{{postgresql_version}}-postgis-{{postgresql_ext_postgis_version}}-scripts"
+    - "postgresql-{{postgresql_version}}-postgis-scripts"
   notify:
     - restart postgresql

data/vendor/ANXS.postgresql/tasks/install_yum.yml

@@ -27,6 +27,7 @@
   with_items:
     - "postgresql{{ postgresql_version_terse }}-server"
     - "postgresql{{ postgresql_version_terse }}"
+    - "postgresql{{ postgresql_version_terse }}-contrib"
 
 - name: PostgreSQL | PGTune
   yum:

data/vendor/ANXS.postgresql/templates/HOWTO.postgresql.conf

@@ -1,3 +1,4 @@
+# {{ ansible_managed }}
 How to add a new PostgreSQL version
 ===================================
 

data/vendor/ANXS.postgresql/templates/etc_monit_conf.d_postgresql.j2

@@ -1,3 +1,4 @@
+# {{ ansible_managed }}
 check process postgresql with pidfile /var/run/postgresql/{{postgresql_version}}-{{postgresql_cluster_name}}.pid
   group database
   start program = "/etc/init.d/postgresql start"

data/vendor/ANXS.postgresql/templates/pg_hba.conf.j2

@@ -1,3 +1,4 @@
+# {{ ansible_managed }}
 # PostgreSQL Client Authentication Configuration File
 # ===================================================
 #

data/vendor/ANXS.postgresql/templates/postgresql.conf-9.1.j2

@@ -1,3 +1,4 @@
+# {{ ansible_managed }}
 # -----------------------------
 # PostgreSQL configuration file
 # -----------------------------