Asara/infra
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Variablize my email, update freshrss for autoinstall now that the pr is merged

Browse source
This commit is contained in:
Amarpreet Minhas 2021-01-16 15:12:58 -05:00
parent 88439a2a8d
commit dbf2a604e0
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -6,7 +6,5 @@ Mah Infra
## Todo ## Todo
1. get a working wallabag instance 1. get a working wallabag instance
https://github.com/wallabag/docker/issues/242 https://github.com/wallabag/docker/issues/242
2. fix up freshrss once this is addressed 2. Proper networking so i'm not manually updating nginx like a chump
https://github.com/FreshRSS/FreshRSS/issues/3349 3. Fix up the user permissions and work towards rootless
3. Proper networking so i'm not manually updating nginx like a chump
4. Fix up the user permissions and work towards rootless

1
ansible/group_vars/all/main.yml
View file

@ -1,6 +1,7 @@
--- ---
# main # main
main_dc_name: columbia main_dc_name: columbia
admin_email_address: amarpreet@minhas.io
# hashicorp defaults # hashicorp defaults
hashi_arch: amd64 hashi_arch: amd64

4
ansible/roles/lego/templates/account.json.j2
View file

@ -1,10 +1,10 @@
{ {
"email": "amarpreet@minhas.io", "email": "{{ admin_email_address }}",
"registration": { "registration": {
"body": { "body": {
"status": "valid", "status": "valid",
"contact": [ "contact": [
"mailto:amarpreet@minhas.io" "mailto:{{ admin_email_address }}"
] ]
}, },
"uri": "https://acme-v02.api.letsencrypt.org/acme/acct/{{ letsencrypt_account_id }}" "uri": "https://acme-v02.api.letsencrypt.org/acme/acct/{{ letsencrypt_account_id }}"

15
nomad/freshrss/freshrss.nomad
View file

@ -60,12 +60,15 @@ job "freshrss" {
template { template {
data = <<EOH data = <<EOH
POSTGRES_DB = "freshrss" POSTGRES_DB = "freshrss"
POSTGRES_USER = "freshrss" POSTGRES_USER = "freshrss"
POSTGRES_PASSWORD = "{{ with secret "kv/data/freshrss" }}{{ .Data.data.db_pw }}{{ end }}" POSTGRES_PASSWORD = "{{ with secret "kv/data/freshrss" }}{{ .Data.data.db_pw }}{{ end }}"
POSTGRES_HOST = "ivyking.node.masked.name" POSTGRES_HOST = "ivyking.node.masked.name"
ROOT_URL = "${NOMAD_ADDR_http}" ROOT_URL = "${NOMAD_ADDR_http}"
JAVA_ARGS = "-Xmx2048m" 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 EOH
destination = "secrets/freshrss.env" destination = "secrets/freshrss.env"
env = true env = true