Merge pull request #149 from DasSkelett/wgkex-venv

Deploy wgkex on workers in a venv

wgkex/init.sls

@@ -1,13 +1,27 @@
 {%- if 'nextgen-gateway' in salt['pillar.get']('netbox:role:name') %}
 
-python3-pyroute2:
+python3-virtualenv:
   pkg.installed
 
 /srv/wgkex:
+  file.directory:
+    - mode: "0755"
+    - user: wgkex
+    - group: wgkex
+
+/srv/wgkex/wgkex:
   git.latest:
-    - name: https://github.com/freifunkMUC/wgkex
-    - target: /srv/wgkex
+    - name: https://github.com/freifunkMUC/wgkex.git
     - rev: main
+    - target: /srv/wgkex/wgkex
+    - user: wgkex
+
+/srv/wgkex/wgkex/venv:
+  virtualenv.managed:
+    - name: /srv/wgkex/wgkex/venv
+    - requirements: /srv/wgkex/wgkex/requirements.txt
+    - user: wgkex
+
 /etc/systemd/system/wgkex.service:
   file.managed:
     - source: salt://wgkex/wgkex.service
@@ -16,7 +30,6 @@ python3-pyroute2:
   file.managed:
     - source: salt://wgkex/wgkex.yaml
 
-
 wgkex-service:
   service.running:
     - name: wgkex
@@ -26,12 +39,4 @@ wgkex-service:
     - watch:
         - file: /etc/wgkex.yaml
 
-systemd-reload-wgkex:
-  cmd.run:
-    - name: systemctl --system daemon-reload
-    - onchanges:
-      - file: /etc/systemd/system/wgkex.service
-    - watch_in:
-      - service: wgkex-service
-
 {% endif %}

wgkex/wgkex.service

@@ -5,8 +5,8 @@ After=network-online.target
 
 [Service]
 User=wgkex
-WorkingDirectory=/srv/wgkex
-ExecStart=/usr/bin/python3 -u -m wgkex.worker.app
+WorkingDirectory=/srv/wgkex/wgkex
+ExecStart=/srv/wgkex/wgkex/venv/bin/python3 -u -m wgkex.worker.app
 Restart=on-failure
 
 # Enable Logging