orats 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faeeee4eabfcbe7dfaf68eefd4f35829731c86d2
-  data.tar.gz: 341436c9d23fd6a6020073095279cee80d80db72
+  metadata.gz: 4f16e8fca3d493283f74cfb52c13272f805f356d
+  data.tar.gz: a0227a92fb0322e35d923994005522fb1f8e1f4c
 SHA512:
-  metadata.gz: b68d46cbb12e94936b6ac9951794e7c06a760f9a5d47d567615b8a1976321b3c6774ebe0a50645aae9c8391c1a7a0e04e86430ec030a412e1242679d9447e683
-  data.tar.gz: d25c4c21a6212f709a7742c29f1122c0482f3e5356ce81a204214b3aef2b688e4a40c192a96767aed1a39c5e87778d929dd4f9244f5487e4c789b43e62449433
+  metadata.gz: 703767326261e5ec820485f01257534a56f645ade04aaf4f23e88af8a668c60c336d41481029115880a1b7e9aa91de1511b79e7f8e6f5b8a00631767e72a2e6a
+  data.tar.gz: f59fa3fa97cfd45ce987d07845d25f72d0f61abd2e5e4756dec1f7ef4dd9a83483f8d51ba19628985911b77cbe776c56e4da3c9df83c3a1714b3c402e658e29c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orats (0.4.8)
+    orats (0.4.9)
       thor (~> 0)
 
 GEM

data/README.md

@@ -66,6 +66,7 @@ running `orats <command name> help` from your terminal. You can also type `orats
     - Configuration:
         - Optionally takes: `--pg-location [localhost]`
         - Optionally takes: `--pg-username [postgres]`
+        - Optionally takes: `--redis-location [localhost]`
         - Optionally takes: `--redis-password []`
     - Template features:
         - Optionally takes: `--auth [false]`
@@ -246,7 +247,9 @@ check out each role then here's a link to their repos:
 - `nickjj.postgres` https://github.com/nickjj/ansible-postgres
 - `nickjj.ruby` https://github.com/nickjj/ansible-ruby
 - `nickjj.rails` https://github.com/nickjj/ansible-rails
+- `nickjj.whenever` https://github.com/nickjj/ansible-whenever
 - `nickjj.pumacorn` https://github.com/nickjj/ansible-pumacorn
+- `nickjj.sidekiq` https://github.com/nickjj/ansible-sidekiq
 - `nickjj.monit` https://github.com/nickjj/ansible-monit
 - `nickjj.nodejs` https://github.com/nickjj/ansible-nodejs
 - `nickjj.nginx` https://github.com/nickjj/ansible-nginx
@@ -254,7 +257,7 @@ check out each role then here's a link to their repos:
 
 You will need to install the roles onto your workstation before you can use them. You can do that by running this command:
 
-`ansible-galaxy install nickjj.user nickjj.security nickjj.postgres nickjj.ruby nickjj.nodejs nickjj.nginx nickjj.rails nickjj.pumacorn nickjj.monit DavidWittman.redis --force`
+`ansible-galaxy install nickjj.user nickjj.security nickjj.postgres nickjj.ruby nickjj.nodejs nickjj.nginx nickjj.rails nickjj.whenever nickjj.pumacorn nickjj.sidekiq nickjj.monit DavidWittman.redis --force`
 
 ### Try it
 

data/lib/orats/cli.rb

@@ -6,6 +6,7 @@ module Orats
     option :pg_location, default: 'localhost'
     option :pg_username, default: 'postgres'
     option :pg_password, required: true
+    option :redis_location, default: 'localhost'
     option :redis_password, default: ''
     option :auth, type: :boolean, default: false, aliases: '-a'
     option :skip_extras, type: :boolean, default: false, aliases: '-E'
@@ -24,6 +25,8 @@ module Orats
 
       `--pg-username` to supply a custom postgres username [postgres]
 
+      `--redis-location` to supply a custom redis location [localhost]
+
       `--redis-password` to supply your development redis password []
 
       Template features:

data/lib/orats/shell.rb

@@ -19,7 +19,7 @@ module Orats
     def gsub_postgres_info
       log_message 'root', 'Changing the postgres information'
 
-      gsub_file "#{@active_path}/.env", ': localhost', ": #{@options[:pg_location]}"
+      gsub_file "#{@active_path}/.env", 'DATABASE_HOST: localhost', "DATABASE_HOST: #{@options[:pg_location]}"
       gsub_file "#{@active_path}/.env", ': postgres', ": #{@options[:pg_username]}"
       gsub_file "#{@active_path}/.env", ': supersecrets', ": #{@options[:pg_password]}"
     end
@@ -29,7 +29,8 @@ module Orats
 
       gsub_file "#{@active_path}/config/initializers/sidekiq.rb", '//', "//:#{ENV['#{@app_name.upcase}_CACHE_PASSWORD']}@"
       gsub_file "#{@active_path}/.env", 'HE_PASSWORD: ', "HE_PASSWORD: #{@options[:redis_password]}"
-      gsub_file "#{@active_path}/config/application.rb", "# pass", "pass"
+      gsub_file "#{@active_path}/.env", 'CACHE_HOST: localhost', "CACHE_HOST: #{@options[:redis_location]}"
+      gsub_file "#{@active_path}/config/application.rb", '# pass', 'pass'
     end
 
     def gsub_project_path
@@ -146,6 +147,7 @@ module Orats
         run "touch #{secrets_path}/redis_password"
       else
         save_secret_string "#{secrets_path}/redis_password"
+        gsub_file "#{path}/inventory/group_vars/all.yml", 'redis_password: false', 'redis_password: true'
       end
       
       save_secret_string "#{secrets_path}/mail_password"

data/lib/orats/templates/base.rb

@@ -254,7 +254,6 @@ git commit: "-m 'Add the puma config'"
 file 'config/sidekiq.yml', <<-CODE
 ---
 :pidfile: <%= ENV['#{app_name_upper}_PROJECT_PATH'] %>/tmp/sidekiq.pid
-:logfile: <%= ENV['#{app_name_upper}_PROJECT_PATH'] %>/log/sidekiq.log
 :concurrency: <%= ENV['#{app_name_upper}_SIDEKIQ_CONCURRENCY'].to_i %>
 :queues:
   - default
@@ -293,7 +292,7 @@ git commit: "-m 'Add the sitemap config'"
 
 file 'config/schedule.rb', <<-CODE
 every 1.day, at: '4:00 am' do
-  rake '-s sitemap:refresh'
+  rake 'sitemap:refresh'
 end
 CODE
 

data/lib/orats/templates/includes/Gemfile

@@ -13,7 +13,7 @@ gem 'pg', '~> 0.17.1'
 gem 'redis-rails', '~> 4.0.0'
 
 gem 'puma', '~> 2.8.2'
-gem 'sidekiq', '~> 3.0.0'
+gem 'sidekiq', '~> 3.1.2'
 gem 'sinatra', '>= 1.4.5', require: false
 gem 'whenever', '~> 0.9.2', require: false
 #gem 'jbuilder'

data/lib/orats/templates/includes/inventory/group_vars/all.yml

@@ -90,16 +90,15 @@ rails_deploy_env:
 nginx_base_domain: 0.0.0.0
 nginx_upstream_name: "{{ rails_deploy_app_name }}"
 nginx_upstream_server: unix://{{ rails_deploy_path }}/tmp/puma.sock
-nginx_root_path: /home/{{ rails_deploy_user }}/{{ rails_deploy_app_name }}.git/public
+nginx_root_path: "{{ rails_deploy_path }}/public"
 nginx_ssl_local_path: "{{ secrets_load_path }}"
 
 # monit configuration
-monit_process_list:
-  "{{ rails_deploy_app_name }}":
-    - check process {{ rails_deploy_app_name }} with pidfile {{ rails_deploy_path }}/tmp/{{ pumacorn_server }}.pid
-    -   start program = "/etc/init.d/{{ rails_deploy_app_name }} start"
-    -   stop program = "/etc/init.d/{{ rails_deploy_app_name }} stop"
-  "sidekiq":
-    - check process sidekiq with pidfile {{ rails_deploy_path }}/tmp/sidekiq.pid
-    -   start program = "/etc/init.d/sidekiq start"
-    -   stop program = "/etc/init.d/sidekiq stop"
+monit_process_list: |
+  check process {{ rails_deploy_app_name }} with pidfile {{ rails_deploy_path }}/tmp/{{ pumacorn_server }}.pid
+    start program = "/etc/init.d/{{ rails_deploy_app_name }} start"
+    stop program = "/etc/init.d/{{ rails_deploy_app_name }} stop"
+
+  check process sidekiq with pidfile {{ rails_deploy_path }}/tmp/sidekiq.pid
+    start program = "/etc/init.d/sidekiq start"
+    stop program = "/etc/init.d/sidekiq stop"

data/lib/orats/templates/play.rb

@@ -152,7 +152,9 @@ file 'site.yml' do <<-TEXT
     - { role: nickjj.nodejs, tags: [app, nodejs] }
     - { role: nickjj.nginx, tags: [app, nginx] }
     - { role: nickjj.rails, tags: [app, rails] }
+    - { role: nickjj.whenever, tags: [app, rails] }
     - { role: nickjj.pumacorn, tags: [app, rails] }
+    - { role: nickjj.sidekiq, tags: [app, rails] }
     - { role: nickjj.monit, tags: [app, monit] }
 TEXT
 end

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor