Merge branch 'master' into nvim-lua

config.yaml

@@ -235,21 +235,8 @@ profiles:
     - terminal
     - Pacman
   mko-laptop:
-    dotfiles:
-    - f_nvimpager
-    - f_hushlogin
-    - f_ripgrep_ignore
-    - f_ranger_commands.py
-    - f_rtv.cfg
-    - f_mailcap
-    - d_zsh
-    - f_zshrc
-    - f_tmux.conf
-    - f_ranger.conf
-    - d_nvim_config
-    - f_init.vim
-    - f_coc-settings.json
-    - f_alacritty.yml
+    include:
+    - terminal
   Edoras:
     include:
     - terminal

docker/mariadb/docker-compose.yaml

@@ -1,18 +0,0 @@
-version: "3"
-services:
-  mariadb:
-    container_name: mariadb
-    image: mariadb
-    environment:
-      - TZ=Europe/Helsinki
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-    networks:
-      - mariadb
-    volumes:
-      - /docker/mariadb:/var/lib/mysql
-      - /etc/localtime:/etc/localtime:ro
-    restart: unless-stopped
-
-networks:
-  mariadb:
-    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