httpd-api (#499)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: #499

docker-compose/httpd/docker-compose.yml.j2

@@ -5,10 +5,29 @@ services:
     image: httpd:bullseye
     restart: always
     volumes:
-      # mounte das lokale Verzeichnis in den Container, der Inhalt ist dann per http aufzurufen; reingeschrieben wird in den lokalen Ordner z.B. per scp aus der Pipeline heraus
-      - /mnt/httpd:/usr/local/apache2/htdocs/
+      - uploads:/usr/local/apache2/htdocs/
       - "${PWD}/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro"
     ports:
       - 3344:80
     labels:
       - com.centurylinklabs.watchtower.enable=true
+
+  python-api-server:
+    container_name: httpd-api
+    image: quotengrote/python-api-server:latest
+    restart: always
+    ports:
+      - "5040:5000"
+    volumes:
+      - uploads:/uploads
+    environment:
+      # FLASK_DEBUG: 1 # for debugging
+      # FLASK_APP: app # for debugging
+      MAX_CONTENT_LENGTH: 50
+      UPLOAD_DIRECTORY: /uploads
+      AUTH_TOKEN: {{ lookup('keepass', 'httpd-api-server-token', 'password') }}
+    labels:
+      - com.centurylinklabs.watchtower.enable=true
+
+volumes:
+  uploads:

group_vars/all.yml

@@ -189,7 +189,7 @@
     - nano
     - ubuntu-advantage-tools
   apt_packages_internet:
-    - http://docker10.grote.lan:3344/bash-helper-scripts-mgrote/bash-helper-scripts-mgrote-latest.deb
+    - http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb
 
 
 

group_vars/fileserver.yml

@@ -75,4 +75,4 @@
   ### mgrote.apt_manage_packages
   apt_packages_internet:
     - https://github.com/rclone/rclone/releases/download/v1.59.2/rclone-v1.59.2-linux-amd64.deb
-    - http://docker10.grote.lan:3344/bash-helper-scripts-mgrote/bash-helper-scripts-mgrote-latest.deb
+    - http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb

host_vars/docker10.grote.lan.yml

@@ -12,21 +12,10 @@
          filesystem: xfs
          mount: true
          mntp: /var/lib/docker
-   - vgname: vg_docker2
-     disks:
-       - /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi2
-     create: true
-     lvnames:
-       - lvname: httpd
-         size: 1G
-         create: true
-         filesystem: xfs
-         mount: true
-         mntp: /mnt/httpd
   manage_lvm: true
   pvresize_to_max: true
   ### mgrote.restic
-  restic_folders_to_backup: "/ /var/lib/docker /mnt/httpd" # --one-file-system ist gesetzt, also werden weitere Dateisysteme nicht eingeschlossen, es sei denn sie werden hier explizit angegeben
+  restic_folders_to_backup: "/ /var/lib/docker" # --one-file-system ist gesetzt, also werden weitere Dateisysteme nicht eingeschlossen, es sei denn sie werden hier explizit angegeben
 
   ### mgrote.docker-compose-inline
   compose_owner: "docker-user"
@@ -47,7 +36,7 @@
     - name: nextcloud
       state: present
       network: traefik
-    - name: httpd # das Volume hat die Rechte 0777 damit jeder per SSH reinschreiben kann; ist fur drone.io eingerichtet; siehe $dir_permissions
+    - name: httpd
       state: present
     - name: unifi-controller
       state: present
@@ -78,10 +67,6 @@
     - name: blocky
       state: present
 
-  #### mgrote.set_permissions
-  dir_permissions:
-    - path: /mnt/httpd
-      mode: '0777'
   ### oefenweb.ufw
   ufw_rules:
     - rule: allow
@@ -159,7 +144,7 @@
       src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/http/http_response
       config: |
         [http_response]
-        env.sites http://docker10.grote.lan:333 http://docker10.grote.lan:8888/nodes http://docker10.grote.lan:1234 https://nextcloud.mgrote.net  http://docker10.grote.lan:2342 http://docker10.grote.lan:8000/login  http://docker10.grote.lan:3344  http://docker10.grote.lan:5000 https://miniflux.mgrote.net/ http://docker10.grote.lan:3001 http://docker10.grote.lan:8081
+        env.sites http://docker10.grote.lan:333 http://docker10.grote.lan:8888/nodes http://docker10.grote.lan:1234 https://nextcloud.mgrote.net  http://docker10.grote.lan:2342 http://docker10.grote.lan:8000/login  http://docker10.grote.lan:3344  http://docker10.grote.lan:5000 https://miniflux.mgrote.net/ http://docker10.grote.lan:3001 http://docker10.grote.lan:8081 http://docker10.grote.lan:5040
         env.max_time 20
         env.short_label true
         env.follow_redirect true

roles/mgrote.alacritty/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-  alacritty_url: http://docker10.grote.lan:3344/alacritty/alacritty-latest.tar.gz
+  alacritty_url: http://docker10.grote.lan:3344/alacritty-latest.tar.gz

roles/mgrote.apt_manage_packages/README.md

@@ -15,7 +15,7 @@ aus.
     - Extra-Parameter für einzelne Hosts
   apt_packages_internet:
     - für URLs
-    - https://git.mgrote.net/mg/bash-helper-scripts-mgrote/raw/branch/master/output/bash-helper-scripts-mgrote-latest.deb
+    - http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb
 
 
 ```