summaryrefslogtreecommitdiff
path: root/roles/elevate
diff options
context:
space:
mode:
Diffstat (limited to 'roles/elevate')
-rw-r--r--roles/elevate/liquid-truth/defaults/main.yml2
-rw-r--r--roles/elevate/liquidtruth/defaults/main.yml2
-rw-r--r--roles/elevate/liquidtruth/handlers/main.yml (renamed from roles/elevate/liquid-truth/handlers/main.yml)0
-rw-r--r--roles/elevate/liquidtruth/tasks/main.yml (renamed from roles/elevate/liquid-truth/tasks/main.yml)2
-rw-r--r--roles/elevate/liquidtruth/tasks/mongodb.yml (renamed from roles/elevate/liquid-truth/tasks/mongodb.yml)0
-rw-r--r--roles/elevate/liquidtruth/tasks/nginx.yml (renamed from roles/elevate/liquid-truth/tasks/nginx.yml)14
-rw-r--r--roles/elevate/liquidtruth/templates/nginx.conf.j2 (renamed from roles/elevate/liquid-truth/templates/nginx.conf.j2)8
7 files changed, 14 insertions, 14 deletions
diff --git a/roles/elevate/liquid-truth/defaults/main.yml b/roles/elevate/liquid-truth/defaults/main.yml
deleted file mode 100644
index 4770c5fb..00000000
--- a/roles/elevate/liquid-truth/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-liquid_truth_srv_disk_size: 12G
diff --git a/roles/elevate/liquidtruth/defaults/main.yml b/roles/elevate/liquidtruth/defaults/main.yml
new file mode 100644
index 00000000..76aa667a
--- /dev/null
+++ b/roles/elevate/liquidtruth/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+liquidtruth_srv_disk_size: 12G
diff --git a/roles/elevate/liquid-truth/handlers/main.yml b/roles/elevate/liquidtruth/handlers/main.yml
index 6deed0cd..6deed0cd 100644
--- a/roles/elevate/liquid-truth/handlers/main.yml
+++ b/roles/elevate/liquidtruth/handlers/main.yml
diff --git a/roles/elevate/liquid-truth/tasks/main.yml b/roles/elevate/liquidtruth/tasks/main.yml
index 7f4749ae..97eee759 100644
--- a/roles/elevate/liquid-truth/tasks/main.yml
+++ b/roles/elevate/liquidtruth/tasks/main.yml
@@ -3,7 +3,7 @@
lvol:
vg: "{{ host_name }}"
lv: "srv"
- size: "{{ liquid_truth_srv_disk_size }}"
+ size: "{{ liquidtruth_srv_disk_size }}"
- name: create filesystem
filesystem:
diff --git a/roles/elevate/liquid-truth/tasks/mongodb.yml b/roles/elevate/liquidtruth/tasks/mongodb.yml
index 244d9849..244d9849 100644
--- a/roles/elevate/liquid-truth/tasks/mongodb.yml
+++ b/roles/elevate/liquidtruth/tasks/mongodb.yml
diff --git a/roles/elevate/liquid-truth/tasks/nginx.yml b/roles/elevate/liquidtruth/tasks/nginx.yml
index a5bd31d7..2066ce27 100644
--- a/roles/elevate/liquid-truth/tasks/nginx.yml
+++ b/roles/elevate/liquidtruth/tasks/nginx.yml
@@ -28,18 +28,18 @@
- name: install nginx config
template:
src: nginx.conf.j2
- dest: /etc/nginx/sites-available/liquid-truth
+ dest: /etc/nginx/sites-available/liquidtruth
notify: restart nginx
- name: check if acme certs already exist
- loop: "{{ liquid_truth_hostnames }}"
+ loop: "{{ liquidtruth_hostnames }}"
stat:
path: "/var/lib/acme/live/{{ item }}"
register: acme_cert_stat
- name: set acmecert_missing_hostnames variable
set_fact:
- acmecert_missing_hostnames: "{{ acme_cert_stat.results | acme_cert_nonexistent(liquid_truth_hostnames) }}"
+ acmecert_missing_hostnames: "{{ acme_cert_stat.results | acme_cert_nonexistent(liquidtruth_hostnames) }}"
- name: link nonexistent hostnames to self-signed interim cert
when: acmecert_missing_hostnames | length > 0
@@ -63,8 +63,8 @@
- name: enable vhost config using acme cert
file:
- src: ../sites-available/liquid-truth
- dest: /etc/nginx/sites-enabled/liquid-truth
+ src: ../sites-available/liquidtruth
+ dest: /etc/nginx/sites-enabled/liquidtruth
state: link
- name: make sure nginx config has been (re)loaded
@@ -74,5 +74,5 @@
import_role:
name: acmetool/cert
vars:
- acmetool_cert_name: "{{ liquid_truth_hostnames[0] }}"
- acmetool_cert_hostnames: "{{ liquid_truth_hostnames }}"
+ acmetool_cert_name: "{{ liquidtruth_hostnames[0] }}"
+ acmetool_cert_hostnames: "{{ liquidtruth_hostnames }}"
diff --git a/roles/elevate/liquid-truth/templates/nginx.conf.j2 b/roles/elevate/liquidtruth/templates/nginx.conf.j2
index e3cdf575..ef690b1c 100644
--- a/roles/elevate/liquid-truth/templates/nginx.conf.j2
+++ b/roles/elevate/liquidtruth/templates/nginx.conf.j2
@@ -8,7 +8,7 @@ map $http_upgrade $connection_upgrade {
server {
listen 80;
listen [::]:80;
- server_name {{ liquid_truth_hostnames | join(' ') }};
+ server_name {{ liquidtruth_hostnames | join(' ') }};
include snippets/acmetool.conf;
@@ -20,12 +20,12 @@ server {
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
- server_name {{ liquid_truth_hostnames | join(' ') }};
+ server_name {{ liquidtruth_hostnames | join(' ') }};
include snippets/acmetool.conf;
include snippets/ssl.conf;
- ssl_certificate /var/lib/acme/live/{{ liquid_truth_hostnames[0] }}/fullchain;
- ssl_certificate_key /var/lib/acme/live/{{ liquid_truth_hostnames[0] }}/privkey;
+ ssl_certificate /var/lib/acme/live/{{ liquidtruth_hostnames[0] }}/fullchain;
+ ssl_certificate_key /var/lib/acme/live/{{ liquidtruth_hostnames[0] }}/privkey;
include snippets/hsts.conf;
location / {