From a14370ff2de4fcb2fa96ae40592f6072a0ea4227 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 25 Jul 2022 10:04:59 +0000
Subject: [PATCH] Add gladys

---
 config/nginx/nginx.conf | 33 +++++++++++++++++++++++++++++++++
 docker-compose.yml      | 25 +++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf
index 699ccb0..ffb62d6 100644
--- a/config/nginx/nginx.conf
+++ b/config/nginx/nginx.conf
@@ -177,6 +177,39 @@ http {
 		}
 	}
 
+	### GLADYS ASSISTANT ###
+
+	upstream gladys {
+		server gladys:80;
+	}
+
+	server {
+		listen 80;
+		server_name gladys.spanskiduh.xyz;
+		access_log /logs/gladys.log custom_log;
+
+		location /.well-known/acme-challenge/ {
+			root /var/www/certbot;
+		}
+
+		location / {
+			return 301 https://gladys.spanskiduh.xyz$request_uri;
+		}
+	}
+
+	server {
+		listen 443 ssl http2;
+		server_name gladys.spanskiduh.xyz;
+
+		ssl_certificate /etc/letsencrypt/live/gladys.spanskiduh.xyz/fullchain.pem;
+		ssl_certificate_key /etc/letsencrypt/live/gladys.spanskiduh.xyz/privkey.pem;
+
+
+		location / {
+			proxy_pass         "http://gladys/";
+		}
+	}
+
 
 	### AUTISM-APP ###
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 85d4daf..5821c3c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,8 @@ networks:
     name: nextcloud
   autism_app_network:
     name: autism_app_network
+  gladys_network:
+    name: gladys_network
 
 services:
 #
@@ -27,6 +29,7 @@ services:
       - nextcloud
       - nextcloud_db
       - autism_app
+      - gladys
     ports:
       - 80:80
       - 443:443
@@ -42,6 +45,7 @@ services:
       - gitea
       - nextcloud
       - autism_app_network
+      - gladys_network
 
   certbot:
     image: certbot/certbot:latest
@@ -125,24 +129,41 @@ services:
     container_name: nextcloud_db
     hostname: nextcloud_db
     restart: unless-stopped
-    volumes:
-      - ${DOCKER_DATA_DIR}/nextcloud_db:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=nextcloud
       - POSTGRES_USER=${POSTGRES_NEXTCLOUD_USERNAME}
       - POSTGRES_PASSWORD=${POSTGRES_NEXTCLOUD_PASSWORD}
+    volumes:
+      - ${DOCKER_DATA_DIR}/nextcloud_db:/var/lib/postgresql/data
     networks:
       - nextcloud
 #
 # HOME-AUTOMATION SERVICES 
 #
 
+  gladys:
+    image: gladysassistant/gladys:v4
+    container_name: gladys
+    privileged: true
+    restart: unless-stopped
+    environment:
+      NODE_ENV: production
+      SQLITE_FILE_PATH: /var/lib/gladysassistant/gladys-production.db
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ${DOCKER_DATA_DIR}/gladysassistant:/var/lib/gladysassistant
+      - /dev:/dev
+    networks:
+      - gladys_network
+
 #
 # OTHER SERVICES 
 #
+
   autism_app:
     container_name: autism_app
     image: autism_app
+    restart: unless-stopped
     build:
       context: ./autism-app
     volumes: