subspace 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 453532a828c7f913ca85866e4e117daef85e0b21dd86092e734abb99ddcaad3a
-  data.tar.gz: e375411d365d7c7decaec797d648766187d2e54512d4226929ebd279686464ba
+  metadata.gz: e15b70fcbd3ba32134d6b7a39e1eb1aa005a4f2cac2a25386cfc1362ad701c1e
+  data.tar.gz: a77ca10a7cd9d1036b9f6f6277c6d392c53a64c6c0dcb870ff7d6a6826ab2b73
 SHA512:
-  metadata.gz: 74b2ba76f056e920cb53e88ebb1b5a8eb3c2e3830158bca9cda71661417b3506a99c27ff4d7d52ebf770f9a22102b86ed712cf1065753fb9d10d855a4c209882
-  data.tar.gz: a11f6ecb4634140f1175415ea3c78160bad5a2e21691b7e889359d23b8099fe49643bbda0901af6a92f7dff182590562c5a7a9b64dfa9accddeef375db068d87
+  metadata.gz: db89f1990335999622b3288c92a783ee0c8ee6e95b5ac67a0045ce17c4cf802288af1a7799524fa7ee94cd19e6a5a31359137eeee33b4da22110555c40bf9bbd
+  data.tar.gz: ea1f49c671900d20ea08f68f3174e21ca3ebf582606c1c56e328926f532c9d7683be70f13f92341fffde0a937c55d4b9d4fc2afa97617136801794304bdb9984

data/CHANGELOG.md

@@ -10,6 +10,10 @@ 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.4.2
+  * Update deprecated syntax for ansible
+  * Fix postgresql-client for python 3
+
 ## 2.4.1
   * Allow extra nginx options via extra_nginx_config eg:
     ```

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

@@ -72,10 +72,6 @@
     tags:
       - maintenance
 
-  - name: Add ppa:ondrej/nginx apt repository for TLS 1.3
-    apt_repository:
-      repo: ppa:ondrej/nginx
-
   - name: apt-get update
     apt: update_cache=yes cache_valid_time=86400
     become: true
@@ -83,6 +79,10 @@
       - upgrade
       - maintenance
 
+  - name: Add ppa:ondrej/nginx apt repository for TLS 1.3
+    apt_repository:
+      repo: ppa:ondrej/nginx
+
   - name: /usr/lib/update-notifier/apt-check --human-readable
     command: /usr/lib/update-notifier/apt-check --human-readable
     tags:

data/ansible/roles/common/templates/motd

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

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

@@ -5,11 +5,19 @@
     dest: /etc/nginx/sites-available/{{project_name}}
   become: true
 
-- name: Enable the app
+- name: Enable the non-ssl app
   file:
     src: /etc/nginx/sites-available/{{project_name}}
     dest: /etc/nginx/sites-enabled/{{project_name}}
-    state: "{{ (ssl_enabled and nginx_ssl_config is defined) | ternary('absent', 'link') }}"
+    state: link
+  when: ssl_enabled != true or nginx_ssl_config is not defined
+  become: true
+
+- name: Disable the non-ssl app
+  file:
+    dest: /etc/nginx/sites-enabled/{{project_name}}
+    state: absent
+  when: (ssl_enabled and nginx_ssl_config is defined)
   become: true
 
 - name: create ssl nginx config for rails app
@@ -23,7 +31,15 @@
   file:
     src: /etc/nginx/sites-available/{{project_name}}-ssl
     dest: /etc/nginx/sites-enabled/{{project_name}}-ssl
-    state: "{{ (ssl_enabled and nginx_ssl_config is defined) | ternary('link', 'absent') }}"
+    state: link
+  when: (ssl_enabled and nginx_ssl_config is defined)
+  become: true
+
+- name: Disable SSL configured app
+  file:
+    dest: /etc/nginx/sites-enabled/{{project_name}}-ssl
+    state: absent
+  when: ssl_enabled != true or nginx_ssl_config is not defined
   become: true
 
 - name: Enable a default server if one is not defined in the app

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

@@ -35,14 +35,49 @@
     - db
     - deps
 
-- name: Install dependencies for the Ansible module
+- name: Install libpq-dev
   when: ansible_os_family == 'Debian'
   become: yes
   apt:
-    name: "{{item}}"
+    name: "libpq-dev"
+    state: present
+    update_cache: yes
+    cache_valid_time: 3600
+  tags:
+    - postgresql
+    - db
+    - deps
+
+- name: "Detect python3"
+  shell: "which python3"
+  register: is_python3
+
+- name: Ensure pip is installed (python3)
+  when: is_python3 is succeeded
+  apt:
+    name: python3-pip
+    state: present
+    update_cache: yes
+  tags:
+    - postgresql
+    - db
+    - deps
+
+- name: Install psycopg2 (python3)
+  when: is_python3 is succeeded
+  become: yes
+  command: "pip3 install psycopg2"
+  tags:
+    - postgresql
+    - db
+    - deps
+
+- name: Install psycopg2 (python2)
+  when: is_python3 is failed
+  become: yes
+  apt:
+    name: python-psycopg2
     state: latest
-  with_items:
-    - python-psycopg2
   tags:
     - postgresql
     - db

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

@@ -87,12 +87,7 @@
   ignore_errors: yes
 
 - name: Install Bundler
-  gem:
-    name: bundler
-    version: "{{ bundler_version }}"
-    state: present
-    user_install: no
-    executable: "{{ ruby_location }}/bin/gem"
+  shell: "{{ ruby_location }}/bin/gem install bundler -v {{ bundler_version }}"
   become: true
 
 - name: Make Ruby symlinks

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Brian Samson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler