0.5.2

docs/all.md

@@ -10,4 +10,5 @@ These variables are used by multiple roles and have the following default values
 
 ```
 reverse_proxy_type: caddy # Allowed values: caddy, none
+```
 

docs/locale.md

@@ -0,0 +1,13 @@
+Generates loacles defined in `gen_locales`, sets `LANG`, `LC_MESSAGES`, and `LANGUAGE` to the values of
+`lang`, `lc_messages` and `language` respectively. These have the following defaults:
+
+```
+gen_locales:
+  - en_US.UTF-8
+  - en_GB.UTF-8
+
+lang: en_US.UTF-8
+lc_messages: "{{ lang }}"
+language: "en_US:en"
+```
+

galaxy.yml

@@ -2,7 +2,7 @@
 
 namespace: uumas
 name: general
-version: 0.5.1
+version: 0.5.2
 readme: README.md
 authors:
   - uumas

roles/locale/README.md

@@ -0,0 +1 @@
+Generates and configures locales

roles/locale/defaults/main.yml

@@ -0,0 +1,10 @@
+---
+
+gen_locales:
+  - en_US.UTF-8
+  - en_GB.UTF-8
+  
+lang: en_US.UTF-8
+lc_messages: "{{ lang }}"
+language: "en_US:en"
+

roles/locale/tasks/main.yml

@@ -0,0 +1,16 @@
+---
+
+- name: Install locales package
+  package:
+    name: locales
+
+- name: Generate locales
+  locale_gen:
+    name: "{{ item }}"
+  loop: "{{ gen_locales }}"
+
+- name: Put default locale config in place
+  template:
+    src: locale.j2
+    dest: /etc/default/locale
+

roles/locale/templates/locale.j2

@@ -0,0 +1,6 @@
+# {{ ansible_managed }}
+
+LANG="{{ lang }}"
+LC_MESSAGES="{{ lc_messages }}"
+LANGUAGE="{{ language }}"
+

roles/reverse_proxy/defaults/main.yml

@@ -1,3 +1,5 @@
 ---
 
 reverse_proxy_type: caddy
+proxy_target_protocol: http
+proxy_target_host: localhost

roles/reverse_proxy/tasks/caddy.yml

@@ -6,7 +6,13 @@
     marker: "# {mark} ANSIBLE MANAGED BLOCK {{ vhost_id }}"
     block: |
       {{ vhost_domains | join(' ') }} {
-        reverse_proxy {{ proxy_target }}
+        reverse_proxy {{ proxy_target_protocol }}://{{ proxy_target_host }}:{{ proxy_target_port }} {
+        {% if proxy_target_protocol == 'https' and proxy_target_host == 'localhost' %}
+          transport http {
+            tls_insecure_skip_verify
+          }
+        {% endif %}
+        }
       }
     validate: 'caddy validate --config %s --adapter caddyfile'
     backup: true

roles/reverse_proxy/tasks/main.yml

@@ -1,5 +1,20 @@
 ---
 
+- block:
+  - name: Split legacy proxy_target to protocol, host and port
+    set_fact:
+      proxy_target_split_protocol: "{{ proxy_target.split('://') }}"
+      proxy_target_split_host: "{{ (proxy_target_split_protocol | last).split(':') }}"
+      proxy_target_host: "{{ proxy_target_split_host[0] }}"
+      proxy_target_port: "{{ proxy_target_split_host[1] }}"
+
+  - name: Set proxy_target_protocol based on proxy_target
+    set_fact:
+      proxy_target_protocol: "{{ proxy_target_split_protocol[0] }}"
+    when: proxy_target_split_protocol | length == 2
+
+  when: proxy_target is defined and proxy_target_port is not defined
+
 - name: Setup {{ vhost_id }} reverse proxy
   include_tasks: "{{ reverse_proxy_type }}.yml"
   when: reverse_proxy_type != 'none'