changes.to merge

element-web/.env

@@ -1 +1 @@
-PORT=<changeme>
+PORT=8004

n8n/docker-compose.yml

@@ -1,18 +1,12 @@
-version: "3"
+version: '3'
 services:
   n8n:
     image: n8nio/n8n
     ports:
       - 8080:5678
     volumes:
-      - n8n:/root/.n8n
+      - n8n:/home/node/.n8n
     restart: unless-stopped
-  networks:
-    n8n
 
 volumes:
   n8n:
-
-networks:
-  n8n:
-    external: true

owncast/docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3'
+services:
+  owncast:
+    container_name: owncast
+    image: gabekangas/owncast:latest
+    ports:
+      - 8080:8080
+      - 1935:1935
+    volumes:
+     - owncast:/app/
+    restart: unless-stopped
+
+volumes:
+  owncast:

rabbitmq/.env.example

@@ -1,5 +1,6 @@
 HOSTNAME=<changeme>
 SSL_HOSTNAME=<changeme>
-WEB_PORT=<changeme>
-#Typically 5672
-RMQ_PORT=<changeme>
+RABBITMQ_DEFAULT_USER=<changeme>
+RABBITMQ_DEFAULT_PASS=<changeme>
+WEB_PORT=15672
+RMQ_PORT=5672

rabbitmq/docker-compose.yml

@@ -1,5 +1,6 @@
 version: "3"
 services:
+<<<<<<< HEAD
   rabbitmq:
     image: "rabbitmq:3-management"
     container_name: rabbitmq
@@ -21,6 +22,29 @@ services:
       - RABBITMQ_MANAGEMENT_SSL_CERTFILE=/data/certs/cert.pem
       - RABBITMQ_MANAGEMENT_SSL_KEYFILE=/data/certs/privkey.pem
     restart: unless-stopped
+=======
+ rabbitmq:
+  image: "rabbitmq:3-management"
+  hostname: ${HOSTNAME}
+  ports:
+    - ${RMQ_PORT}:5672
+    - ${WEB_PORT}:15671
+  volumes:
+    - rabbitmq_data:/var/lib/rabbitmq
+    - rabbitmq_def:/opt/definitions.json
+    - rabbitmq_conf:/etc/rabbitmq/rabbitmq.config
+    - /etc/letsencrypt/live/${SSL_HOSTNAME}/fullchain.pem:/data/certs/fullchain.pem
+    - /etc/letsencrypt/live/${SSL_HOSTNAME}/cert.pem:/data/certs/cert.pem
+    - /etc/letsencrypt/live/${SSL_HOSTNAME}/privkey.pem:/data/certs/privkey.pem
+  environment:
+    - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
+    - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
+    - RABBITMQ_MANAGEMENT_SSL_CACERTFILE=/data/certs/fullchain.pem
+    - RABBITMQ_MANAGEMENT_SSL_CERTFILE=/data/certs/cert.pem
+    - RABBITMQ_MANAGEMENT_SSL_KEYFILE=/data/certs/privkey.pem
+  restart: unless-stopped
+
+>>>>>>> b35561958a0159eecba086f00d84a7230e9eae74
 volumes:
   rabbitmq_data:
   rabbitmq_def: