subspace 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9292a51100ec75aaa115290b5220c7dc9dc6bb7
-  data.tar.gz: 791331cd64e3dcc1b450c8a1d4ba5839cdca0d49
+  metadata.gz: 97810da82feed7d91e5e2e6c4bceab27812c3217
+  data.tar.gz: 389446d27e1246762e691ca5582879577a4218a9
 SHA512:
-  metadata.gz: 65cae20f78b81ada19a5ef63a0f61fc131059276a7b6fc892105b08eaef71d7596ba2add94dd3aa0803b522034652e1bb44287d24c2501f8ecf3ed55c9e05a51
-  data.tar.gz: 471bca6a702f80484fd7c7d92001103da6e6b712f5ef991434f6dde0fdcd67e8e039238ef8ce0f2b9db5ab8405d6261969318a8204a6e16d668d29d3ffcab6d6
+  metadata.gz: 88dc66c1cfe739d3d6cc2ff7049fa74dac314d8af1f2e2599ec576c70d075189d63b07be321e9c6a013873263dd85750fa1daed33a82a36b7752c7af1dfe7e9d
+  data.tar.gz: bc0e6a036626de95bc4519890e562a499732780581f7cf73dddac58f8601be84b0eed8b8d93b3e0f8ea8e50ef0b993111670fc886f9b9ae9dc965e5add2e71b2

data/README.md

@@ -167,7 +167,8 @@ If you'd like more control over the certs created, you can define the variables
         domains:
           - othersite.example.com
 
-Note that this role needs to be defined /before/ the apache role
+Note that this role needs to be included _before_ the webserver (apache or
+nginx) role
 
 ## logrotate
 

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

@@ -1,7 +1,4 @@
 ---
-  - set_fact:
-      apache2_installed: true
-
   - name: Install apache2
     apt:
       pkg: apache2

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

@@ -47,7 +47,7 @@
       dest: /etc/collectd/collectd.conf.d/apache2.conf
     sudo: true
     notify: restart collectd
-    when: apache2_installed is defined
+    when: "'apache' in role_names"
 
   - name: create puma config
     template:
@@ -63,7 +63,7 @@
       dest: /etc/collectd/collectd.conf.d/nginx.conf
     sudo: true
     notify: restart collectd
-    when: nginx_installed is defined
+    when: "'nginx' in role_names"
 
   - name: create rails_lograge config
     template:

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

@@ -59,27 +59,17 @@
     command: "{{certbot_dir}}/certbot-auto certonly --email {{letsencrypt_email}} --domains {{item.domains | join(',')}} --cert-name {{item.cert_name}} --standalone --agree-tos --expand --non-interactive"
 
   - name: Update nginx default options
-    when: nginx_installed is defined
+    when: "'nginx' in role_names"
     get_url:
       url: https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/options-ssl-nginx.conf
       dest: /etc/letsencrypt/options-ssl-nginx.conf
 
   - name: Update apache default options
-    when: apache2_installed is defined
+    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: "Re-run apache rails_project to get SSL configuration"
-    when: apache2_installed is defined
-    include_role:
-      name: apache-rails
-
-  - name: "Re-run nginx rails_project to get SSL configuration"
-    when: nginx_installed is defined
-    include_role:
-      name: nginx-rails
-
   - name: start webserver after standalone mode
     debug: msg="Startup webserver"
     notify: start webserver

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

@@ -1,8 +1,4 @@
 ---
-- name: Remove the app's symlink, if exists
-  command: rm -rf /etc/nginx/sites-enabled/{{project_name}}
-  become: true
-
 - name: create nginx config for rails app
   template:
     src: nginx-project

data/ansible/roles/nginx-rails/templates/_rails.conf

@@ -5,6 +5,7 @@ location @app {
     proxy_pass http://app;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
     # pass the upgrade headers so websockets work
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";

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

@@ -1,12 +1,11 @@
-- set_fact:
-    nginx_installed: true
-
 - name: Install nginx
   apt: pkg=nginx state=latest
   become: true
 
 - name: Remove the default app
-  command: rm -rf /etc/nginx/sites-enabled/default
+  file:
+    path: /etc/nginx/sites-enabled/default
+    state: absent
   become: true
 
 - name: "Configure rails projects"

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,6 @@ files:
 - ansible/roles/delayed_job/templates/delayed-job-monit-rc
 - ansible/roles/letsencrypt/defaults/main.yml
 - ansible/roles/letsencrypt/tasks/main.yml
-- ansible/roles/letsencrypt/templates/project-le-ssl.conf
 - ansible/roles/logrotate/LICENSE
 - ansible/roles/logrotate/README.md
 - ansible/roles/logrotate/defaults/main.yml
@@ -289,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ansible-based server provisioning for rails projects

data/ansible/roles/letsencrypt/templates/project-le-ssl.conf

@@ -1,31 +0,0 @@
-<IfModule mod_ssl.c>
-    <VirtualHost *:443>
-        ServerName {{server_name}}
-        {% for alias in server_aliases %}
-        ServerAlias {{alias}}
-        {% endfor %}
-        RailsEnv {{rails_env}}
-        # !!! Be sure to point DocumentRoot to 'public'!
-        DocumentRoot /u/apps/{{project_name}}/current/public
-        <Directory /u/apps/{{project_name}}/current/public>
-            # This relaxes Apache security settings.
-            AllowOverride all
-            # MultiViews must be turned off.
-            Options -MultiViews
-            # Uncomment this if you're on Apache >= 2.4:
-            Require all granted
-        </Directory>
-        <Location /assets/>
-          # Use of ETag is discouraged when Last-Modified is present
-          Header unset ETag
-          FileETag None
-          # RFC says only cache for 1 year
-          ExpiresActive On
-          ExpiresDefault "access plus 1 year"
-        </Location>
-        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
-    </VirtualHost>
-</IfModule>