subspace 0.5.15 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1385856eec9059353b8de985b61712f987f16e54
-  data.tar.gz: e7885584a297c3f332d7b0904407892fbb393e63
+  metadata.gz: 42e80d0103ba572639f75442c374fa988c50d5b7
+  data.tar.gz: bb46e90302c646e5bfef916b55a8a013c0141ee1
 SHA512:
-  metadata.gz: 6e7c3a38ca6702389b7c913906cdabd167d0c83628beb9662d72bd1c78ef4ac974dfffe2bbf027d8c7a67194b99c60db29add0542fb30fb1199075d5a4dc0454
-  data.tar.gz: 67034239d1a64fe0da90ce9be4997d80844186e88d4a4d8ea1aa42ce7561da0db0e278e3a30572f542250bdb3afc5a903ccb3ed2d7692243b276650e18751623
+  metadata.gz: 1ff42416a19df23c9f4ef3dfa37d581c995cce1c9c969ab2cf5c02ca819e5c5b7aee89f2d45f341a9976186631a4d140da060b943719c3df52aa5866792ac472
+  data.tar.gz: 7828e0667d414cedbe71922eedef425a3bd995ba48cbe24f681eecfa6a323e3fa46b09be019e6137c32ded31d668162e10642a92cecd5fed6052552a7de6c9b2

data/CHANGELOG.md

@@ -6,7 +6,19 @@ This project attempts to follow [semantic versioning](https://semver.org/)
 
 ## Unreleased
 
-* _nada_
+* nada
+
+## 0.6.15 - 2018-07-17
+
+* features
+  * The nginx collectd configuration now reports number of errors (500-503),
+    timeouts (504) and successes (200, 302, 304)
+  * Add alienvault role that can configure ubuntu to send syslog to a sensor.
+  * nginx-rails role: Add ability to set nginx's `proxy_read_timeout`.
+
+* bug fixes
+  * Don't have rails role install yarn -- it's not needed by default, and if the
+    project does need it, it should explicitly use the yarn role.
 
 ## 0.5.15 - 2018-06-15
 

data/README.md

@@ -225,6 +225,8 @@ Optional variables:
     asset_cors_allow_origin: Set this to set the Access-Control-Allow-Origin for
     everything in /assets.
 
+    nginx_proxy_read_timeout: Set [proxy_read_timeout](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_read_timeout). This is in seconds. You probably only want to change this if using rack-timeout (although I may be wrong). If using rack-timeout, it should be slightly higher than the rack-timeout timeout. I'm doing 5 seconds higher, but that was arbitrarily chosen.
+
 ## nodejs
 
 Used to install recent version of NodeJS. Must set `nodejs_version`. e.g. `nodejs_version: "8.x"`

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

@@ -0,0 +1,13 @@
+---
+  - name: Enable syslog communication to sensor
+    lineinfile:
+      dest: "/etc/rsyslog.d/50-default.conf"
+      line: "*.* @{{alienvault_usm_anywhere_sensor_ip}}:514"
+      state: present
+    become: true
+
+  - name: Restart rsyslog
+    service:
+      name: rsyslog
+      enabled: yes
+      state: restarted

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

@@ -2,3 +2,27 @@ LoadPlugin "nginx"
 <Plugin "nginx">
   URL "http://localhost:{{status_port}}"
 </Plugin>
+LoadPlugin "tail"
+<Plugin "tail">
+  <File "/var/log/nginx/access.log">
+    Instance "nginx"
+    <Match>
+      Regex " (200|30[24]) "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "status-ok"
+    </Match>
+    <Match>
+      Regex " 504 "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "status-timeout"
+    </Match>
+    <Match>
+      Regex " 50[0-3] "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "status-error"
+    </Match>
+  </File>
+</Plugin>

data/ansible/roles/common/templates/motd

@@ -4,7 +4,7 @@ This server brought to you by:
 \___ \| | | | '_ \___ \| '_ \ / _` |/ __/ _ \
  ___) | |_| | |_) |__) | |_) | (_| | (_|  __/
 |____/ \__,_|_.__/____/| .__/ \__,_|\___\___|
-                       |_|             v0.5.15
+                       |_|             v0.6.15
 ~~~ https://github.com/tenforwardconsulting/subspace ~~~
 
 If you need to make configuration changes to the server, please modify the

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

@@ -9,6 +9,9 @@
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
     proxy_redirect off;
+    {% if nginx_proxy_read_timeout is defined %}
+    proxy_read_timeout {{nginx_proxy_read_timeout}};
+    {% endif %}
   }
 
   location /cable {

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

@@ -1,14 +1,4 @@
 ---
-  - name: Add yarn apt key
-    apt_key:
-      url: https://dl.yarnpkg.com/debian/pubkey.gpg
-      state: present
-
-  - name: Add yarn apt repo
-    apt_repository:
-      repo: deb https://dl.yarnpkg.com/debian/ stable main
-      state: present
-
   - name: Install rails apt dependencies
     apt:
       name: "{{item}}"
@@ -22,7 +12,6 @@
       - libxslt-dev
       - nodejs
       - zlib1g-dev
-      - yarn
     become: true
 
   - name: Create /u/apps/{{project_name}}/shared/config

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.5.15"
+  VERSION = "0.6.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.15
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - Rakefile
 - TODO
 - ansible/playbooks/local_template.yml
+- ansible/roles/alienvault/tasks/main.yml
 - ansible/roles/apache-rails/tasks/main.yml
 - ansible/roles/apache-rails/templates/_canonical_domain.conf
 - ansible/roles/apache-rails/templates/_rails.conf