subspace 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7d67442d9d8f4d6e936c27e62bfa3975b2a78a68f2cbee3684163a93cafab9
-  data.tar.gz: 5779b928d53d165975310a59b362b4b092388f495bb15d1da7c28602fddfe2e4
+  metadata.gz: 50c74536ff3fc20a7730591b63c47fa9773e1095bd463d53eb3957b7dba51b2c
+  data.tar.gz: 72da343c7309a8724c6ee9d05aa2b7c8b8a3e196908bb27c187b8f00d2506df0
 SHA512:
-  metadata.gz: b71b2a2f3b4b42a61a65436ed888a735ec6d5d6d9ee17366843453ae016a594ede442d7750c1f191264166a9f58db71cb9a3435058f4fcb60fa66e3188a27996
-  data.tar.gz: 43cd84e03cd768befea33217d5d7440d1ac83c2cdd5e87e0b2ba2d1920dd9c1e24271274fd2c4c0be522f177e9f71cd976bd4c92160e379d670876bde77239e8
+  metadata.gz: 2918d316fb057dbff91d6ca706b3dc03a6bd86dabf37bfd7b65f5be9aa0f759ecbf7deb3edece400980a19a8329a72a59f0564f075966f92c03985436696b633
+  data.tar.gz: 1dc18633e071cd577a5a5ce74ad657069db557193cdcf78286f6ce1fc2144df74ddc09d839c86f7778de0fc78bc3a8f379a7ad3f247b8dca577e57a6e7078004

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.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
+
 ## 2.2.0
   * Add maintenance_mode command
   * Add ppa:ondrej/nginx repo in common role for TLS 1.3 and nginx support

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

@@ -60,7 +60,7 @@
   - name: Update nginx default options
     when: "'nginx' in role_names"
     get_url:
-      url: https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf
+      url: https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf
       dest: /etc/letsencrypt/options-ssl-nginx.conf
 
   - name: Update apache default options
@@ -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/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.0"
+  VERSION = "2.3.1"
 end

data/subspace.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  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.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Brian Samson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     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
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ansible-based server provisioning for rails projects
 test_files: []