taperole 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b3693d4c2374e8670a819d8928300364b5b620
-  data.tar.gz: f6480a756202450260f116c6567e1014e9188ca7
+  metadata.gz: 5beb90566bc6af152ef963be074a7c3649391035
+  data.tar.gz: b2a4c4a5eee178a6fb0731adc65d263955e0420c
 SHA512:
-  metadata.gz: 67c48721bcb96906abdb8eb15acab63309571aaa25259e7d444a7312cf881a90ffd5b4d64e210838ffb0b0eee94b12bc4a6c9be7c4a77086d0a053e121a40ed8
-  data.tar.gz: fd02631e6fc92ba0d24e9dec2937cd26c54415dba834270b679a570f8e095761441a9ff9a672817aad41129baf4d397daa3b00eb801312533f5cdd6947b597a4
+  metadata.gz: b627d9e2ec359f728ca296a856f491b5877499f99cbe328f41dbf0826e4e612c5584537313fa9068acf16613e4072378ce4ff904f91de8c194e3b4734793ede3
+  data.tar.gz: 553e1d708b09dcec6187a73a1f54392f23078486b4518a9a194ac6de857cd4ad653da59755ea567a8070485bb30da6c63a2602469abb133b41365c47af1ab20a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 2.0.7
+* Cleanup to the puma configs installed on a server
+* omnibox.yml is now provision.yml
+* Fixes bugs for redis where pidfile was in wrong location
+* Increase default swapfile saize
+
+### 2.0.6
+* Disable public key pinning so you don't brick your site
+
 ### 2.0.5
 * Fixes letsencrypt bugs
 * Uses letsencrypt hooks when renewing cert

data/README.md

@@ -75,7 +75,7 @@ backup_hosts:
 ### Custom roles
 You can add app specific ansible roles to `<app_root>/roles`.
 
-You must then specify the roles you want to use in `omnibox.yml` or `deploy.yml`
+You must then specify the roles you want to use in `provision.yml` or `deploy.yml`
 
 [Read the Ansible docs on playbook roles here](http://docs.ansible.com/playbooks_roles.html)
 

data/lib/taperole/core/ansible_runner.rb

@@ -28,7 +28,7 @@ module Taperole
     end
 
     def ansible(args: '', options: {})
-      exec_ansible("#{tapefiles_dir}/omnibox.yml", args, options)
+      exec_ansible("#{tapefiles_dir}/provision.yml", args, options)
     end
 
     def ansible_deploy(args: '', options: {})

data/lib/taperole/core/installer.rb

@@ -18,7 +18,7 @@ module Taperole
     end
 
     def uninstall_tape
-      rm "#{tapefiles_dir}/omnibox.yml"
+      rm "#{tapefiles_dir}/provision.yml"
       rm "#{tapefiles_dir}/deploy.yml"
       rm "#{tapefiles_dir}/tape_vars.yml"
       rm "#{tapefiles_dir}/rake.yml"
@@ -45,7 +45,7 @@ module Taperole
     end
 
     def copy_static_app_examples
-      %w(omnibox deploy tape_vars).each do |base_filename|
+      %w(provision deploy tape_vars).each do |base_filename|
         copy_example(
           "templates/static_html/#{base_filename}.example.yml",
           "#{tapefiles_dir}/#{base_filename}.yml"
@@ -54,7 +54,7 @@ module Taperole
     end
 
     def copy_basic_examples
-      %w(omnibox deploy tape_vars rake).each do |base_filename|
+      %w(provision deploy tape_vars rake).each do |base_filename|
         copy_example(
           "templates/base/#{base_filename}.example.yml",
           "#{tapefiles_dir}/#{base_filename}.yml"

data/lib/taperole/version.rb

@@ -1,3 +1,3 @@
 module Taperole
-  VERSION = '2.0.6'.freeze
+  VERSION = '2.0.7'.freeze
 end

data/roles/general/tasks/swapfile.yml

@@ -16,6 +16,12 @@
 - name: Put the swap entry into fstab
   mount: name=none src={{ swap_file.path }} fstype=swap opts=sw passno=0 dump=0 state=present
 
+- name: Check swapon swapfile
+  shell: swapon | grep "{{ swap_file.path }}"
+  ignore_errors: True
+  register: swap_file_is_on
+
 - name: Swapon swapfile
   command: swapon {{ swap_file.path }}
-  when: ansible_swaptotal_mb < 1
+  when: swap_file_is_on.stdout == ""
+

data/roles/puma_install/templates/puma.production.rb.j2

@@ -4,6 +4,8 @@ workers {{puma_workers}}
 # Min and Max threads per worker
 threads 1, 6
 
+daemonize
+
 # Default to production
 rails_env = "{{be_app_env}}"
 environment rails_env

data/roles/puma_install/templates/puma_init.j2

@@ -16,7 +16,6 @@
 # This monit wrapper script will be called by monit as root
 # Edit these variables to your liking
 
-RAILS_ENV={{ be_app_env }}
 USER={{ deployer_user.name }}
 APP_DIR={{ be_app_path }}
 PUMA_CONFIG_FILE=$APP_DIR/config/puma.production.rb
@@ -48,8 +47,8 @@ case "$1" in
     rm -f $PUMA_SOCKET
 
     if [ -e $PUMA_CONFIG_FILE ] ; then
-      echo "cd $APP_DIR && RAILS_ENV=$RAILS_ENV bundle exec puma -C $PUMA_CONFIG_FILE --daemon"
-      /bin/su - $USER -c "cd $APP_DIR && RAILS_ENV=$RAILS_ENV bundle exec puma -C $PUMA_CONFIG_FILE --daemon"
+      echo "cd $APP_DIR && bundle exec puma -C $PUMA_CONFIG_FILE --daemon"
+      /bin/su - $USER -c "cd $APP_DIR && bundle exec puma -C $PUMA_CONFIG_FILE --daemon"
     else
       echo "ERROR: No config file found in $PUMA_CONFIG_FILE"
     fi
@@ -59,8 +58,8 @@ case "$1" in
 
   stop)
     echo "Stopping puma..."
-      echo "cd $APP_DIR && RAILS_ENV=$RAILS_ENV bundle exec pumactl stop"
-      /bin/su - $USER -c "cd $APP_DIR && RAILS_ENV=$RAILS_ENV bundle exec pumactl --config-file $PUMA_CONFIG_FILE stop"
+      echo "cd $APP_DIR && bundle exec pumactl stop"
+      /bin/su - $USER -c "cd $APP_DIR && bundle exec pumactl --config-file $PUMA_CONFIG_FILE stop"
       rm -f $PUMA_PID_FILE
       rm -f $PUMA_SOCKET
 
@@ -70,7 +69,7 @@ case "$1" in
   restart)
     if puma_is_running ; then
       echo "Hot-restarting puma..."
-      /bin/su - $USER -c "cd $APP_DIR && RAILS_ENV=$RAILS_ENV bundle exec pumactl --config-file $PUMA_CONFIG_FILE restart"
+      /bin/su - $USER -c "cd $APP_DIR && bundle exec pumactl --config-file $PUMA_CONFIG_FILE restart"
 
       echo "Doublechecking the process restart..."
       sleep 15

data/roles/puma_install/templates/puma_monit.j2

@@ -3,4 +3,3 @@ check process puma
   start program = "/etc/init.d/puma start"
   stop program = "/etc/init.d/puma stop"
   restart program = "/etc/init.d/puma restart"
-  group myapp

data/roles/redis/templates/redis.j2

@@ -1,5 +1,5 @@
 check process redis-server
-    with pidfile "/var/run/redis/redis.pid"
+    with pidfile "/var/run/redis/redis-server.pid"
     start program = "/etc/init.d/redis-server start"
     stop program = "/etc/init.d/redis-server stop"
     if 2 restarts within 3 cycles then timeout

data/spec/commands/installer_spec.rb

@@ -30,8 +30,8 @@ describe Taperole::Commands::Installer do
         expect(taperole).to include('deploy.yml')
       end
 
-      it 'creates omnibox.yml' do
-        expect(taperole).to include('omnibox.yml')
+      it 'creates provision.yml' do
+        expect(taperole).to include('provision.yml')
       end
 
       it 'creates tape_vars.yml' do
@@ -46,8 +46,8 @@ describe Taperole::Commands::Installer do
         expect(taperole).to include('deploy.yml')
       end
 
-      it 'creates omnibox.yml' do
-        expect(taperole).to include('omnibox.yml')
+      it 'creates provision.yml' do
+        expect(taperole).to include('provision.yml')
       end
 
       it 'creates tape_vars.yml' do
@@ -71,7 +71,7 @@ describe Taperole::Commands::Installer do
   describe '#uninstall' do
     let(:setup) do
       Dir.mkdir("#{Dir.pwd}/taperole")
-      FileUtils.touch("#{Dir.pwd}/taperole/omnibox.yml")
+      FileUtils.touch("#{Dir.pwd}/taperole/provision.yml")
       FileUtils.touch("#{Dir.pwd}/taperole/deploy.yml")
       FileUtils.touch("#{Dir.pwd}/taperole/tape_vars.yml")
       FileUtils.touch("#{Dir.pwd}/taperole/rake.yml")
@@ -82,8 +82,8 @@ describe Taperole::Commands::Installer do
     end
     let(:command) { :uninstall }
 
-    it 'removes omnibox.yml' do
-      expect(taperole).to_not include('omnibox.yml')
+    it 'removes provision.yml' do
+      expect(taperole).to_not include('provision.yml')
     end
 
     it 'removes deploy.yml' do

data/test/rails/Dockerfile

@@ -20,7 +20,7 @@ ADD ./test/rails/tape_vars.yml taperole/tape_vars.yml
 
 # FIXME
 # Disable ufw bc docker gets mad about iptables
-RUN sed -i '/ufw/d' taperole/omnibox.yml
+RUN sed -i '/ufw/d' taperole/provision.yml
 
 # Run Tape
 RUN echo '[omnibox]' > taperole/hosts

data/vars/defaults.yml

@@ -22,7 +22,7 @@ puma_sockfile: "{{ be_app_path }}/tmp/puma_{{ app_name }}.sock"
 
 swap_file:
   path: /swp
-  size_kb: "{{ 1024 * 1024 }}"
+  size_kb: "{{ 3 * 1024 * 1024 }}"
 
 # echo 'password' | md5
 database_password: 286755fad04869ca523320acce0dc6a4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taperole
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Jack Forrest
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -200,11 +200,11 @@ files:
 - taperole.gemspec
 - templates/base/deploy.example.yml
 - templates/base/hosts.example
-- templates/base/omnibox.example.yml
+- templates/base/provision.example.yml
 - templates/base/rake.example.yml
 - templates/base/tape_vars.example.yml
 - templates/static_html/deploy.example.yml
-- templates/static_html/omnibox.example.yml
+- templates/static_html/provision.example.yml
 - templates/static_html/tape_vars.example.yml
 - test/base_docker_box/Dockerfile
 - test/rails/Dockerfile