subspace 2.2.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64ed71940340580eb07acb31250ae9789e90029f5767075fe8fc7b4eb2f159d
-  data.tar.gz: d77efbd7886fff620e5c39bbd7be7d3cc6448b677ab6c9501c9f1eb4b40610a6
+  metadata.gz: d70ec4242c8be2ce016722c2d9898127ae130ebca3e83de4c315dea753ee22f0
+  data.tar.gz: 53f5b0d0ab09490196682e46a12b9d2e77994ff979fd8b5556ad8c8013a0f177
 SHA512:
-  metadata.gz: 01eb907f9d1c43fd6230b5fddda42db24ec2b5c9184df4a69a6f40ec081bbe27b1d31f480bf67f238a22b38204faf6aa5a79237f2c4d1830a80339006e395c1f
-  data.tar.gz: 54a67f7a9d613b50fe5898fee3b3bf764aeef9105d84521815a7fffa44a3b9382234213292ebbd277a3695dfec8d0a1276f95e47f18e0a20739248f3d958481a
+  metadata.gz: 937e805b162030f75968f34a265dd67570bc9787d117b3f8548fcb490c2444b0cb07bb1506614e9910d4b07e87b22a38780381a779e81c4f1e78bbf0f499aa91
+  data.tar.gz: 476d91fd00279a70ca8b7a922fde12710c9324ec67ce9a4ef4e991b2c7fdb72e949cac89cd121105239ca075fd32eac34c4cf89adb237c981e3e1f1e32d46f84

data/CHANGELOG.md

@@ -10,6 +10,24 @@ 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.2
+  * Update papertrail to latest version of remote_syslog2 and add support for nginx logs
+
+## 2.3.1
+  * Sidekiq concurrency actually works
+
+## 2.3.0
+  * Grab linux kernel to send as stats
+  * Grab psql version to send as stats
+
+## 2.2.3
+  * Add PATH to crontab for letsencrypt auto renewal
+  * log letsencrypt crontab to /var/log/cron.log
+  * fix setting hostname with systemd
+
+## 2.2.2
+  * Use state: "present" instead of "installed"
+
 ## 2.2.1
   * Update URL for letsencrypt tls raw file
 

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

@@ -59,6 +59,7 @@
   - name: Set hostname for systemd
     hostname:
       name: "{{hostname}}"
+      use: systemd
     become: true
     tags:
       - maintenance
@@ -251,4 +252,30 @@
     tags:
       - maintenance
 
+  - name: Grab OS version
+    shell: uname --kernel-release
+    register: stats_os_version
+    when: send_stats == true and stats_url is defined and stats_api_key is defined
+    tags:
+      - maintenance
+      - stats
+
+  - name: Send OS stats to URL
+    uri:
+      url: "{{stats_url}}"
+      method: POST
+      headers:
+        X-API-Version: 1
+        X-Client-Api-key: "{{stats_api_key}}"
+      body_format: json
+      body:
+        client_stat:
+          key: os_version
+          value: "{{stats_os_version.stdout}}"
+          hostname: "{{hostname}}"
+    when: send_stats == true and stats_url is defined and stats_api_key is defined
+    tags:
+      - maintenance
+      - stats
+
   - import_tasks: swap.yml

data/ansible/roles/common/templates/motd

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

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

@@ -74,14 +74,20 @@
     notify: start webserver
     changed_when: true
 
+  - name: Set path at top of crontab
+    cron:
+      name: PATH
+      env: yes
+      job: /usr/bin:/bin:/usr/sbin
+
   - name: Setup cron job to auto renew
     become: true
     when: "'apache' in role_names"
     cron:
       name: Auto-renew SSL
-      job: "{{certbot_dir}}/certbot-auto renew --quiet --no-self-upgrade --apache"
-      hour: 0
-      minute: 33
+      job: "{{certbot_dir}}/certbot-auto renew --no-self-upgrade --apache >> /var/log/cron.log 2>&1"
+      hour: "0"
+      minute: "33"
       state: present
 
   - name: Setup cron job to auto renew
@@ -89,7 +95,7 @@
     when: "'nginx' in role_names"
     cron:
       name: Auto-renew SSL
-      job: "{{certbot_dir}}/certbot-auto renew --quiet --no-self-upgrade --nginx"
-      hour: 0
-      minute: 33
+      job: "{{certbot_dir}}/certbot-auto renew --no-self-upgrade --nginx >> /var/log/cron.log 2>&1"
+      hour: "0"
+      minute: "33"
       state: present

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

@@ -3,4 +3,4 @@
   apt: update_cache=yes cache_valid_time=86400
 
 - name: Install Memcached.
-  apt: name=memcached state=installed
+  apt: name=memcached state=present

data/ansible/roles/mtpereira.passenger/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
 passenger_webserver: "standalone"
-passenger_pkgs_state: "installed"
+passenger_pkgs_state: "present"
 passenger_pkgs_fix_shebang: no
 become: true

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

@@ -1,6 +1,6 @@
 ---
   - name: Install remote_syslog from papertrail
-    command: wget -O /tmp/remote_syslog.tar.gz https://github.com/papertrail/remote_syslog2/releases/download/v0.13/remote_syslog_linux_amd64.tar.gz  creates=/usr/bin/remote_syslog
+    command: wget -O /tmp/remote_syslog.tar.gz https://github.com/papertrail/remote_syslog2/releases/download/v0.20/remote_syslog_linux_amd64.tar.gz  creates=/usr/bin/remote_syslog
 
   - command: tar xzf /tmp/remote_syslog.tar.gz chdir=/tmp/ creates=/usr/bin/remote_syslog
 
@@ -10,7 +10,7 @@
   - file: path=/usr/bin/remote_syslog owner=root group=root mode=0755
     become: true
 
-  - command: wget -O /etc/init.d/remote_syslog https://raw.githubusercontent.com/papertrail/remote_syslog2/v0.13/examples/remote_syslog.init.d creates=/etc/init.d/remote_syslog
+  - command: wget -O /etc/init.d/remote_syslog https://raw.githubusercontent.com/papertrail/remote_syslog2/v0.20/examples/remote_syslog.init.d creates=/etc/init.d/remote_syslog
     become: true
 
   - file: path=/etc/init.d/remote_syslog owner=root group=root mode=0755
@@ -20,8 +20,10 @@
 
   - file: path=/tmp/remote_syslog.tar.gz state=absent
 
-  - service: name=remote_syslog state=restarted enabled=yes
+  - template: src=log_files.yml dest=/etc/log_files.yml owner=root group=root mode=0644
     become: true
 
-  - template: src=log_files.yml dest=/etc/log_files.yml owner=root group=root mode=0644
+  - service: name=remote_syslog state=restarted enabled=yes
     become: true
+
+

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

@@ -1,7 +1,14 @@
 # Variables: papertrail_host, papertrail_port
 files:
-  - /var/log/apache2/error.log
   - /u/apps/{{project_name}}/shared/log/{{rails_env}}.log
+{% if 'nginx' in role_names %}
+  - /var/log/nginx/error.log
+{% endif %}
+{% if 'apache' in role_names %}
+  - /var/log/apache2/error.log
+{% endif %}
+
 destination:
   host: {{papertrail_host}}
   port: {{papertrail_port}}
+  protocol: tls

data/ansible/roles/postgresql-client/tasks/main.yml

@@ -47,3 +47,29 @@
     - postgresql
     - db
     - deps
+
+- name: Grab Psql version
+  shell: psql --version
+  register: stats_psql_version
+  when: send_stats == true and stats_url is defined and stats_api_key is defined
+  tags:
+    - maintenance
+    - stats
+
+- name: Send Psql stats to URL
+  uri:
+    url: "{{stats_url}}"
+    method: POST
+    headers:
+      X-API-Version: 1
+      X-Client-Api-key: "{{stats_api_key}}"
+    body_format: json
+    body:
+      client_stat:
+        key: psql_version
+        value: "{{stats_psql_version.stdout}}"
+        hostname: "{{hostname}}"
+  when: send_stats == true and stats_url is defined and stats_api_key is defined
+  tags:
+    - maintenance
+    - stats

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

@@ -38,3 +38,29 @@
 
   - include: backups.yml
     become: true
+
+  - name: Grab Psql version
+    shell: psql --version
+    register: stats_psql_version
+    when: send_stats == true and stats_url is defined and stats_api_key is defined
+    tags:
+      - maintenance
+      - stats
+
+  - name: Send Psql stats to URL
+    uri:
+      url: "{{stats_url}}"
+      method: POST
+      headers:
+        X-API-Version: 1
+        X-Client-Api-key: "{{stats_api_key}}"
+      body_format: json
+      body:
+        client_stat:
+          key: psql_version
+          value: "{{stats_psql_version.stdout}}"
+          hostname: "{{hostname}}"
+    when: send_stats == true and stats_url is defined and stats_api_key is defined
+    tags:
+      - maintenance
+      - stats

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

@@ -1,16 +1,7 @@
 ---
   - name: Install rails apt dependencies
     apt:
-      name: "{{item}}"
-    with_items:
-      - git
-      - libffi-dev
-      - libgmp3-dev
-      - libpq-dev
-      - libxslt-dev
-      - nodejs
-      - zlib1g-dev
-      - ffmpeg
+      name: ['git', 'libffi-dev', 'libgmp3-dev', 'libpq-dev',  'libxslt-dev', 'nodejs', 'zlib1g-dev' ,'ffmpeg']
     become: true
     when: ('Ubuntu' in ansible_distribution)
     tags:

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

@@ -1,2 +1,2 @@
 ---
-  sidekiq_concurrency: 5
+  sidekiq_concurrency: 10

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

@@ -1,4 +1,4 @@
 check process sidekiq
   with pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid
-  start program = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current && bundle exec sidekiq --queue {{hostname}} {{ job_queues | map('regex_replace',  '^(.*)$', '--queue \\1') | join(' ') }} --pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid --environment {{rails_env}} --logfile /u/apps/{{project_name}}/shared/log/sidekiq.log --daemon'" with timeout 30 seconds
+  start program = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current && bundle exec sidekiq --queue {{hostname}} {{ job_queues | map('regex_replace',  '^(.*)$', '--queue \\1') | join(' ') }} -c {{sidekiq_concurrency}} --pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid --environment {{rails_env}} --logfile /u/apps/{{project_name}}/shared/log/sidekiq.log --daemon'" with timeout 30 seconds
   stop program = "/bin/su - deploy -c 'kill -s TERM `cat /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid`'" with timeout 30 seconds

data/lib/subspace/commands/bootstrap.rb

@@ -26,7 +26,7 @@ class Subspace::Commands::Bootstrap < Subspace::Commands::Base
       "path=/home/{{ansible_ssh_user}}/.ssh state=directory mode=0700",
       "-vvvv"
     ]
-    cmd = add_pass_through_params cmd
+    cmd = cmd | pass_through_params
     bootstrap_command cmd
   end
 

data/lib/subspace/version.rb

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

data/subspace.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "commander", "~>4.2"

data/template/provision/group_vars/all.erb

@@ -5,10 +5,13 @@ use_sudo: true
 
 # ruby-common
 # pull the checksum/url from https://www.ruby-lang.org/en/downloads/
-ruby_version: ruby-2.2.5
-ruby_checksum: 30c4b31697a4ca4ea0c8db8ad30cf45e6690a0f09687e5d483c933c03ca335e3
-ruby_download_location: 'http://cache.ruby-lang.org/pub/ruby/ruby-2.2.5.tar.gz'
+ruby_version: ruby-2.7.1
+ruby_checksum: d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418
+ruby_download_location: https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.gz
+bundler_version: 2.1.4
 
-# passenger
-passenger_webserver: apache
-passenger_pkgs_state: installed
+# Other stuff
+letsencrypt_email: 
+nodejs_version: 13.x
+ssl_enabled: true
+postgresql_version: 11.7

data/template/provision/templates/application.yml.template

@@ -4,24 +4,24 @@
 # These environment variables are available to all environments, and can be secret or not:
 
 # These are secret and can be changed per environment easily by using subspace vars <env> --edit
-SECRET_KEY_BASE: {{SECRET_KEY_BASE}}
-AWS_SECRET_KEY: {{AWS_SECRET_KEY}}
+# SECRET_KEY_BASE: {{SECRET_KEY_BASE}}
+# AWS_SECRET_KEY: {{AWS_SECRET_KEY}}
 
 # These are not secret, and have the same value for all environments
-ENABLE_SOME_FEATURE: false
-MAX_USER_INVITES: 20
-DEFAULT_EMAIL_ADDRESS: test@example.com
+# ENABLE_SOME_FEATURE: false
+# MAX_USER_INVITES: 20
+# DEFAULT_EMAIL_ADDRESS: test@example.com
 
 
 # These variable are not secret, but have different, static values for all environments
 development:
-  INSECURE_VARIABLE: "this isn't secret"
-  AWS_BUCKET: my-app-development
+  # INSECURE_VARIABLE: "this isn't secret"
+  # AWS_BUCKET: my-app-development
 
 dev:
-  INSECURE_VARIABLE: "but it changes"
-  AWS_BUCKET: my-app-dev
+  # INSECURE_VARIABLE: "but it changes"
+  # AWS_BUCKET: my-app-dev
 
 production:
-  INSECURE_VARIABLE: "on different servers"
-  AWS_BUCKET: my-app-production
+  # INSECURE_VARIABLE: "on different servers"
+  # AWS_BUCKET: my-app-production

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Brian Samson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +288,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -303,8 +303,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ansible-based server provisioning for rails projects
 test_files: []