subspace 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5df2a1343e51341e96380ee4011b182a8970ef6
-  data.tar.gz: bcb4a135d9c459ab06eec7b892c6d695ab5fc36b
+  metadata.gz: ca511a2d66e4f9af50e1e8893eb20fabbad6cbd2
+  data.tar.gz: d59c53e9678ac83bebec8e82fefece0f4ca7098c
 SHA512:
-  metadata.gz: 92cdf7edb1a970a973a3134fed38d2405307e59dae8713408a33e2514d573633c4c625a5bbb6e7c5bd2e0541bb3172c847b77cdfe9dc7f2c4b693ee95ffe6799
-  data.tar.gz: 3aff151c039fb156a764d34d153e12e4a43ecf2fbc48406db5298b0495e112532c3b43d6031262cb85cb81742c473d768dd5fe82671a361c72fb3be32bff029c
+  metadata.gz: 83bcf5cce0af7d0ed0326158cffd593b8a97dedf2d33435de829de8e98d4ad2e7ed2e3e17577fa7030c2dbd5e446b531de072b03c613efa2889159b8d5313379
+  data.tar.gz: 22b14772ebce5a982cebaca776f9ff81fe3ceb8988a5adaf47847f0e5202e79f57c4693a4502b1d08fc803079a40879b186bbf8a5b2319b7ee93821319a6c9c7

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

@@ -2,6 +2,3 @@
   server_aliases: []
   apache_project_conf: project.conf
   ssl_enabled: false
-  #apache_ssl_config: ""
-  #ssl_cert_path: /etc/letsencrypt/site/server.crt
-  #ssl_key_path: /etc/letsencrypt/site/server.key

data/ansible/roles/apache-rails/tasks/main.yml

@@ -9,7 +9,7 @@
     file:
       src: /etc/apache2/sites-available/{{project_name}}.conf
       dest: /etc/apache2/sites-enabled/{{project_name}}.conf
-      state: "{{ ssl_enabled and apache_ssl_config is defined | ternary('absent', 'link')}}"
+      state: "{{ (ssl_enabled and apache_ssl_config is defined) | ternary('absent', 'link')}}"
     become: true
 
   - name: Create Apache SSL config
@@ -22,5 +22,5 @@
     file:
       src: /etc/apache2/sites-available/{{project_name}}-ssl.conf
       dest: /etc/apache2/sites-enabled/{{project_name}}-ssl.conf
-      state: "{{ ssl_enabled and apache_ssl_config is defined | ternary('link', 'absent')}}"
+      state: "{{ (ssl_enabled and apache_ssl_config is defined) | ternary('link', 'absent')}}"
     become: true

data/ansible/roles/apache-rails/templates/project-ssl.conf

@@ -9,6 +9,7 @@
     {% else %}
     Redirect / "https://%{HTTP_HOST}/"
     {% endif %}
+
 </VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -17,5 +18,6 @@
 
         {{apache_ssl_config | indent(8, true)}}
         {% include "_canonical_domain.conf" %}
+
     </VirtualHost>
 </IfModule>

data/ansible/roles/collectd/templates/graphite.conf

@@ -5,7 +5,7 @@ LoadPlugin write_graphite
                 Port "{{graphite_port}}"
                 Protocol "tcp"
                 #LogSendErrors true
-                Prefix "collectd."
+                Prefix "collectd.{{project_name}}."
                 #Postfix "collectd"
                 StoreRates true
                 AlwaysAppendDS false

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

@@ -1,5 +1,4 @@
 ---
   server_aliases: []
   ssl_enabled: false
-  nginx_ssl_config: ""
   status_port: 8081

data/ansible/roles/nginx-rails/tasks/main.yml

@@ -13,18 +13,19 @@
   file:
     src: /etc/nginx/sites-available/{{project_name}}
     dest: /etc/nginx/sites-enabled/{{project_name}}
-    state: "{{ ssl_enabled | ternary('absent', 'link')}}"
+    state: "{{ (ssl_enabled and nginx_ssl_config is defined) | ternary('absent', 'link') }}"
   become: true
 
-- name: create nginx config for rails app
+- name: create ssl nginx config for rails app
   template:
     src: nginx-project-ssl
     dest: /etc/nginx/sites-available/{{project_name}}-ssl
+  when: (ssl_enabled and nginx_ssl_config is defined)
   become: true
 
 - name: Enable SSL configured app
   file:
     src: /etc/nginx/sites-available/{{project_name}}-ssl
     dest: /etc/nginx/sites-enabled/{{project_name}}-ssl
-    state: "{{ ssl_enabled | ternary('link', 'absent')}}"
+    state: "{{ (ssl_enabled and nginx_ssl_config is defined) | ternary('link', 'absent') }}"
   become: true

data/ansible/roles/puma/templates/puma-monit-rc

@@ -1,5 +1,5 @@
 check process puma
   with pidfile /u/apps/{{project_name}}/current/tmp/pids/puma.pid
-  start program = "/bin/su - {{deploy_user}} -c 'cd /u/apps/{{project_name}}/current && bundle exec pumactl -F config/puma/{{rails_env}}.rb start'"
-  stop program = "/bin/su - {{deploy_user}} -c 'cd /u/apps/{{project_name}}/current && bundle exec pumactl -F config/puma/{{rails_env}}.rb stop'"
+  start program = "/bin/su - {{deploy_user}} -c 'cd /u/apps/{{project_name}}/current && bundle exec pumactl -F /u/apps/{{project_name}}/shared/config/puma/{{rails_env}}.rb start'"
+  stop program = "/bin/su - {{deploy_user}} -c 'cd /u/apps/{{project_name}}/current && bundle exec pumactl -F /u/apps/{{project_name}}/shared/config/puma/{{rails_env}}.rb stop'"
   group puma

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler