removed temp file

Reviewed-on: #18

pillars/roles/nginx/jellyseerr.sls

@@ -0,0 +1,20 @@
+nginx:
+  jellyseerr:
+    auth: none
+    default: no
+    https:
+      port: 5055
+      prot: http
+  request:
+    auth: none
+    default: no
+    https:
+      port: 5055
+      prot: http
+
+portal:
+  Media:
+    request:
+      name: Mediar Request Server
+      summary: Jellyseerr media request server
+      public: false

pillars/roles/nginx/nextcloud.sls

@@ -1,10 +1,11 @@
+
 nginx:
   cloud:
     auth: none
     https:
       port: 8080
       prot: http
-
+    nolocal: true
 portal:
   Misc:
     cloud:

pillars/roles/nginx/prowlarr.sls

@@ -0,0 +1,14 @@
+nginx:
+  prowlarr:
+    auth: 2fa
+    default: no
+    https:
+      port: 9696
+      prot: http
+
+portal:
+  Media:
+    prowlarr:
+      name: Torrent Indexers
+      summary: Prowlarr Server
+      public: false

pillars/roles/nginx/readarr.sls

@@ -0,0 +1,14 @@
+nginx:
+  readarr:
+    auth: 2fa
+    default: no
+    https:
+      port: 8787
+      prot: http
+
+portal:
+  Media:
+    readarr:
+      name: Audiobook/ebook Downloader
+      summary: Readarr Server
+      public: false

pillars/servers/roles/server/arr.sls

@@ -6,8 +6,9 @@ roles:
   - arr
   - sonarr
   - radarr
+  - readarr
   - lidarr
   - bazarr
-  - jackett
+  - prowlarr
   - ytdownloader
   - podfox

pillars/servers/roles/server/jellyseerr.sls

@@ -0,0 +1,7 @@
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - jellyseerr

states/roles/maintain/certbot/certbot.sh

@@ -1,3 +1,6 @@
 echo "Running certbot renew" > /root/scripts/certbot.log
 /bin/certbot renew >> /root/scripts/certbot.log
 echo "Finished certbot renew" >> /root/scripts/certbot.log
+echo "Copying certs to /secure" >> /root/scripts/certbot.log
+cp -rL /etc/letsencrypt/live/* /secure/certs/
+echo "Done copying certs to /secure" >> /root/scripts/certbot.log

states/roles/maintain/host/balloon.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Automatically adjust balloon size to free up unused memory
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/bin/bash /root/scripts/balloon.sh
+
+[Install]
+WantedBy=multi-user.target

states/roles/maintain/host/balloon.sh

@@ -0,0 +1,21 @@
+for domain in `virsh list --name`
+do
+  virsh dommemstat --period 5 $domain
+  max=`virsh dominfo $domain | grep Max | grep -Po "\d+"`
+  current=`virsh dominfo $domain | grep Used | grep -Po "\d+"`
+  unused=`virsh dommemstat $domain | grep unused | grep -Po "\d+"`
+  used=$(($current - $unused))
+  newfree=$((($max - $used) / 5))
+  if test $newfree -gt 524288
+  then
+    target=$(($newfree + $used))
+  else
+    target=$((524288 + $used))
+  fi
+  if test $target -gt $max
+  then
+    target=$max
+  fi
+  echo "$domain: $target"
+  virsh setmem $domain --size $target
+done

states/roles/maintain/host/balloon.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Update balloon sizes  every 10 minutes
+
+[Timer]
+OnCalendar=*:0/10
+Unit=balloon.service
+
+[Install]
+WantedBy=multi-user.target

states/roles/maintain/host/init.sls

@@ -99,3 +99,35 @@ libvirtd:
 #      - file: /etc/systemd/network/br1.netdev
 #      - file: /etc/systemd/network/br1.network
 #      - file: /etc/systemd/network/uplink.network
+
+
+/root/scripts/balloon.sh:
+  file.managed:
+    - source: salt://roles/maintain/host/balloon.sh
+    - user: root
+    - group: root
+    - mode: 644
+
+/lib/systemd/system/balloon.service:
+  file.managed:
+    - source: salt://roles/maintain/host/balloon.service
+    - user: root
+    - group: root
+    - mode: 644
+
+/lib/systemd/system/balloon.timer:
+  file.managed:
+    - source: salt://roles/maintain/host/balloon.timer
+    - user: root
+    - group: root
+    - mode: 644
+    
+balloon-reload:
+  module.run:
+    - name: service.systemctl_reload
+    - onchanges:
+      - file: /lib/systemd/system/*
+
+balloon.timer:
+  service.running:
+    - enable: true

states/roles/maintain/jellyseerr/init.sls

@@ -0,0 +1,14 @@
+{%- set os=grains['os'] -%}
+
+jellyseerr:
+  pkg.installed:
+    - name: jellyseerr
+  service.running:
+    - enable: true
+    
+#/etc/conf.d/jellyfin:
+#  file.managed:
+#    - source: salt://roles/maintain/jellyfin/jellyfin
+#    - user: root
+#    - group: root
+#    - mode: 644

states/roles/maintain/nginx-proxy/init.sls

@@ -49,6 +49,8 @@ nginx:
     - makedirs: true
   {%- if portal is defined %}
     - source: salt://roles/maintain/nginx-proxy/remote.conf
+  {%- elif pillar['nginx'][name]['nolocal'] is defined and pillar['nginx'][name]['nolocal'] == 'true' %}
+    - source: salt://roles/maintain/nginx-proxy/empty.conf
   {%- else %}
     - source: salt://roles/maintain/nginx-proxy/local.conf
   {%- endif %}

states/roles/maintain/nginx-proxy/local.conf

@@ -19,13 +19,12 @@
     {%- set prot = "https" -%}
   {%- endif -%}
 server {
-  listen 443;
+  listen 443 ssl;
   server_name {{server}}.actcur.com {{wildcard}};
 
 #  resolver {{ resolver }};
   set $backend "{{prot}}://127.0.0.1{%- if port is defined -%}:{{port}}{%- endif -%}";
 
-  ssl on;
   ssl_certificate /etc/nginx/certs/{{server}}.actcur.com/fullchain.pem;
   ssl_certificate_key /etc/nginx/certs/{{server}}.actcur.com/privkey.pem;
   ssl_session_cache shared:SSL:10m;

states/roles/maintain/nginx-proxy/portal.conf

@@ -1,12 +1,11 @@
 server {
 
-  listen 443 default_server;
+  listen 443 ssl default_server;
   server_name portal.actcur.com;
 
   resolver {{resolver}};
   set $certbot "https://salt.actcur.com";
 
-  ssl on;
   ssl_certificate /etc/nginx/certs/portal.actcur.com/fullchain.pem;
   ssl_certificate_key /etc/nginx/certs/portal.actcur.com/privkey.pem;
   ssl_session_cache shared:SSL:10m;

states/roles/maintain/nginx-proxy/remote.conf

@@ -12,14 +12,13 @@
 {%- endif -%}
 
 server {
-  listen 443;
+  listen 443 ssl;
   server_name {{server}}.actcur.com {{wildcard}};
 
   resolver {{resolver}};
   set $backend "https://{{server}}.actcur.com";
   set $certbot "https://salt.actcur.com";
 
-  ssl on;
   ssl_certificate /etc/nginx/certs/{{server}}.actcur.com/fullchain.pem;
   ssl_certificate_key /etc/nginx/certs/{{server}}.actcur.com/privkey.pem;
   ssl_session_cache shared:SSL:10m;

states/roles/maintain/prowlarr/init.sls

@@ -0,0 +1,22 @@
+/var/lib/prowlarr:
+  file.symlink:
+    - target: /mnt/data/prowlarr
+    - force: true
+    - mkdirs: true
+    
+#package is in aur repo
+prowlarr:
+  pkg.installed
+
+prowlarr_service:
+  service.running:
+    - name: prowlarr
+    - enable: true
+
+flaresolverr:
+  pkg.installed
+
+flaresolverr_service:
+  service.running:
+    - name: flaresolverr
+    - enable: true

states/roles/maintain/readarr/init.sls

@@ -0,0 +1,14 @@
+/var/lib/readarr:
+  file.symlink:
+    - target: /mnt/data/readarr
+    - force: true
+    - mkdirs: true
+
+#package is in aur repo
+readarr-develop:
+  pkg.installed
+
+readarr_service:
+  service.running:
+    - name: readarr
+    - enable: true