subspace 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d70ec4242c8be2ce016722c2d9898127ae130ebca3e83de4c315dea753ee22f0
-  data.tar.gz: 53f5b0d0ab09490196682e46a12b9d2e77994ff979fd8b5556ad8c8013a0f177
+  metadata.gz: d486a8c58000fa5ffe980ccf53ba74bec6a42e4f437f67d1ad763a563f62d8fa
+  data.tar.gz: 4222caa44b5be3baf9f81366a2afced697891d5fe1c3b4b06c797f4f36c96781
 SHA512:
-  metadata.gz: 937e805b162030f75968f34a265dd67570bc9787d117b3f8548fcb490c2444b0cb07bb1506614e9910d4b07e87b22a38780381a779e81c4f1e78bbf0f499aa91
-  data.tar.gz: 476d91fd00279a70ca8b7a922fde12710c9324ec67ce9a4ef4e991b2c7fdb72e949cac89cd121105239ca075fd32eac34c4cf89adb237c981e3e1f1e32d46f84
+  metadata.gz: 8a326248f9f5cc36515902ef3cf8a0dd58655998925f3a82449310383fa2f5bbc97bf23b8d5f7a0e42552d8563c27281174d244faf657b0944d65af3d7d3aedc
+  data.tar.gz: f6d685d12230db7ce1daaa89e35c2b776bf7c7af968ed6c9c4c56b7fb5203e9df7ce9e63623bec20ab8a9166cffd1e156b6073544b2e57629ec9eea172bb24e4

data/CHANGELOG.md

@@ -10,6 +10,9 @@ This project attempts to follow [semantic versioning](https://semver.org/)
   * Not working on OSX - macs don't read from /etc/profile.d/
   * Stops showing color if you `sudo su`
 
+## 2.3.3
+  * Tweak the way that different roles are detected to be more reliable
+
 ## 2.3.2
   * Update papertrail to latest version of remote_syslog2 and add support for nginx logs
 

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

@@ -52,3 +52,7 @@
       state: link
     become: true
     notify: apache restart
+
+  - name: Apache is installed
+    set_fact:
+      apache_installed: true

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

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

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

@@ -28,3 +28,7 @@
 - name: Restart nginx
   action: service name=nginx state=restarted
   become: true
+
+- name: Nginx is installed
+  set_fact:
+    nginx_installed: true

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

@@ -20,10 +20,12 @@
 
   - file: path=/tmp/remote_syslog.tar.gz state=absent
 
-  - template: src=log_files.yml dest=/etc/log_files.yml owner=root group=root mode=0644
+  - name: Create /etc/log_files
+    template: src=log_files.yml dest=/etc/log_files.yml owner=root group=root mode=0644
     become: true
 
-  - service: name=remote_syslog state=restarted enabled=yes
+  - name: Restart rsyslog
+    service: name=remote_syslog state=restarted enabled=yes
     become: true
 
 

data/ansible/roles/papertrail/templates/log_files.yml

@@ -1,10 +1,10 @@
 # Variables: papertrail_host, papertrail_port
 files:
   - /u/apps/{{project_name}}/shared/log/{{rails_env}}.log
-{% if 'nginx' in role_names %}
+{% if nginx_installed is defined %}
   - /var/log/nginx/error.log
 {% endif %}
-{% if 'apache' in role_names %}
+{% if apache_installed is defined %}
   - /var/log/apache2/error.log
 {% endif %}
 

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Brian Samson