From dbf2a604e0adaf26bf87d89eb67d78260fc850ed Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Sat, 16 Jan 2021 15:12:58 -0500
Subject: [PATCH] Variablize my email, update freshrss for autoinstall now that
 the pr is merged

---
 README.md                                    |  6 ++----
 ansible/group_vars/all/main.yml              |  1 +
 ansible/roles/lego/templates/account.json.j2 |  4 ++--
 nomad/freshrss/freshrss.nomad                | 15 +++++++++------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 91100fd..9280ecf 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,5 @@ Mah Infra
 ## Todo
 1. get a working wallabag instance
     https://github.com/wallabag/docker/issues/242
-2. fix up freshrss once this is addressed
-    https://github.com/FreshRSS/FreshRSS/issues/3349
-3. Proper networking so i'm not manually updating nginx like a chump
-4. Fix up the user permissions and work towards rootless
+2. Proper networking so i'm not manually updating nginx like a chump
+3. Fix up the user permissions and work towards rootless
diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml
index 4639e33..e0f6ded 100644
--- a/ansible/group_vars/all/main.yml
+++ b/ansible/group_vars/all/main.yml
@@ -1,6 +1,7 @@
 ---
 # main
 main_dc_name: columbia
+admin_email_address: amarpreet@minhas.io
 
 # hashicorp defaults
 hashi_arch: amd64
diff --git a/ansible/roles/lego/templates/account.json.j2 b/ansible/roles/lego/templates/account.json.j2
index d7042d2..b796658 100644
--- a/ansible/roles/lego/templates/account.json.j2
+++ b/ansible/roles/lego/templates/account.json.j2
@@ -1,10 +1,10 @@
 {
-	"email": "amarpreet@minhas.io",
+	"email": "{{ admin_email_address }}",
 	"registration": {
 		"body": {
 			"status": "valid",
 			"contact": [
-				"mailto:amarpreet@minhas.io"
+				"mailto:{{ admin_email_address }}"
 			]
 		},
 		"uri": "https://acme-v02.api.letsencrypt.org/acme/acct/{{ letsencrypt_account_id }}"
diff --git a/nomad/freshrss/freshrss.nomad b/nomad/freshrss/freshrss.nomad
index b678ea9..468e079 100644
--- a/nomad/freshrss/freshrss.nomad
+++ b/nomad/freshrss/freshrss.nomad
@@ -60,12 +60,15 @@ job "freshrss" {
 
       template {
         data = <<EOH
-          POSTGRES_DB       = "freshrss"
-          POSTGRES_USER     = "freshrss"
-          POSTGRES_PASSWORD = "{{ with secret "kv/data/freshrss" }}{{ .Data.data.db_pw }}{{ end }}"
-          POSTGRES_HOST     = "ivyking.node.masked.name"
-          ROOT_URL          = "${NOMAD_ADDR_http}"
-          JAVA_ARGS         = "-Xmx2048m"
+POSTGRES_DB       = "freshrss"
+POSTGRES_USER     = "freshrss"
+POSTGRES_PASSWORD = "{{ with secret "kv/data/freshrss" }}{{ .Data.data.db_pw }}{{ end }}"
+POSTGRES_HOST     = "ivyking.node.masked.name"
+ROOT_URL          = "${NOMAD_ADDR_http}"
+JAVA_ARGS         = "-Xmx2048m"
+FRESHRSS_ENV      = "production"
+FRESHRSS_INSTALL  = " --api_enabled --base_url https://rss.minhas.io --db-base freshrss --db-host ivyking.node.masked.name --db-password {{ with secret "kv/data/freshrss" }}{{ .Data.data.db_pw }}{{ end }} --db-type pgsql --db-user freshrss --default_user asara --language en"
+TZ                = "America/New_York"
         EOH
         destination = "secrets/freshrss.env"
         env         = true