docker/auth/.gitignore

@@ -1 +0,0 @@
-.env

docker/auth/docker-compose.yaml

@@ -1,20 +0,0 @@
-version: "2"
-
-services:
-  openldap:
-    container_name: openldap
-    image: osixia/openldap:stable
-    environment:
-      - TZ=Europe/Helsinki
-      - LDAP_ORGANIZATION="Korhonen"
-      - LDAP_DOMAIN="korhonen.cc"
-      - LDAP_ADMIN_PASSWORD="${LDAP_ADMIN_PASSWORD}"
-    hostname: ldap.korhonen.cc
-    ports:
-      - 389:389
-      - 636:636
-    restart: unless-stopped
-    volumes:
-      - /docker/auth/openldap/ldap:/var/lib/ldap
-      - /docker/auth/openldap/slapd.d:/etc/ldap/slapd.d
-      - /etc/localtime:/etc/localtime:ro

docker/homeautomation/docker-compose.yml

@@ -64,9 +64,37 @@ services:
     restart: unless-stopped
     depends_on:
       - home-assistant
+      - opentts
     devices:
       - "/dev/snd:/dev/snd"
 
+  opentts:
+    image: synesthesiam/opentts
+    container_name: opentts
+    ports:
+      - 5500:5500
+    command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002
+    tty: true
+    networks:
+      - homeautomation
+    depends_on:
+      - marytts
+      - mozillatts
+    restart: unless-stopped
+  marytts:
+    image: synesthesiam/marytts:5.2
+    container_name: marytts
+    restart: unless-stopped
+    tty: true
+    networks:
+      - homeautomation
+  mozillatts:
+    image: synesthesiam/mozilla-tts
+    container_name: mozillatts
+    tty: true
+    networks:
+      - homeautomation
+
   node-red:
     container_name: node-red
     image: nodered/node-red

docker/traefik/docker-compose.yaml

@@ -17,10 +17,9 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro
+      - /docker/traefik/traefik.yml:/traefik.yml:ro
-      - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro
+      - /docker/traefik/dashboard-users:/dashboard-users:ro
-      - /docker/træfik/træfik/acme.json:/acme.json
+      - /docker/traefik/acme.json:/acme.json
-      - /docker/træfik/træfik/log:/var/log
     labels:
       - 'traefik.enable=true'
 
@@ -37,17 +36,6 @@ services:
       - 'traefik.http.routers.dashboard.tls.certresolver=http'
       - 'traefik.http.routers.dashboard.service=api@internal'
 
-  fail2ban:
-    image: crazymax/fail2ban:latest
-    container_name: fail2ban
-    restart: unless-stopped
-    network_mode: "host"
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    volumes:
-      - /docker/træfik/træfik/log:/var/log/træfik:ro
-      - /docker/træfik/fail2ban:/data
 networks:
   proxy:
     external: true

docker/wordpress/docker-compose.yaml

@@ -0,0 +1,54 @@
+version: "3.3"
+
+services:
+  wordpress:
+    container_name: wordpress
+    image: wordpress:latest
+    environment:
+      - TZ=Europe/Helsinki
+      - WORDPRESS_DB_HOST=mariadb-wordpress:3306
+      - WORDPRESS_DB_USER=wordpress
+      - WORDPRESS_DB_PASSWORD=wordpress
+      - WORDPRESS_DB_NAME=wordpress
+    restart: unless-stopped
+    networks:
+      - proxy
+      - wordpress
+    volumes:
+      - /docker/wordpress/wordpress:/var/www/html
+      - /etc/localtime:/etc/localtime:ro
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.routers.wordpress-redirect.entrypoints=http"
+      - "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)"
+      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
+      - "traefik.http.routers.wordpress-redirect.middlewares=http2https"
+
+      - "traefik.http.routers.wordpress.entrypoints=https"
+      - "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)"
+      - "traefik.http.routers.wordpress.tls=true"
+      - "traefik.http.routers.wordpress.tls.certresolver=http"
+      - "traefik.http.routers.wordpress.service=wordpress"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.services.wordpress.loadbalancer.server.port=80"
+
+  mariadb-wordpress:
+    image: mariadb
+    container_name: mariadb-wordpress
+    volumes:
+      - /docker/wordpress/mariadb:/var/lib/mysql
+    restart: always
+    networks:
+      - wordpress
+    environment:
+      - MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E
+      - MYSQL_DATABASE=wordpress
+      - MYSQL_USER=wordpress
+      - MYSQL_PASSWORD=wordpress
+
+networks:
+  proxy:
+    external: true
+  wordpress:
+    external: false

dotdrop

@@ -1 +1 @@
-Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5
+Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5