ansible/group_vars/all/main.yml

@@ -64,7 +64,7 @@ nomad_version: 1.0.1
 nomad_podman_driver_version: 0.1.0
 
 # podman
-podman_version: 3.0.1+dfsg1-2+b1
+podman_version: 3.0.1+dfsg1-1+b1
 
 # lnd
 lnd_version: 0.12.1-beta

nomad/freshrss.nomad

@@ -60,15 +60,14 @@ job "freshrss" {
 
       template {
         data = <<EOH
-CRON_MIN          = '13,43'
-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 --base_url https://rss.minhas.io"
-JAVA_ARGS         = "-Xmx2048m"
 POSTGRES_DB       = "freshrss"
-POSTGRES_HOST     = "ivyking.node.masked.name"
-POSTGRES_PASSWORD = "{{ with secret "kv/data/freshrss" }}{{ .Data.data.db_pw }}{{ end }}"
 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"

nomad/nextcloud.nomad

@@ -59,7 +59,7 @@ job "nextcloud" {
       }
 
       resources {
-        cpu    = 5000
+        cpu    = 2000
         memory = 2560
       }
     }

nomad/wallabag.nomad

@@ -72,7 +72,7 @@ job "wallabag" {
       }
 
       resources {
-        cpu    = 4000
+        cpu    = 2000
         memory = 2560
       }
     }