From d86dac39c5f250f651a6f213f280ef67d8ad411f Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 30 Jan 2021 11:46:02 +0200
Subject: [PATCH 1/2] Add wordpress

---
 docker/mariadb/docker-compose.yaml   | 18 ----------
 docker/wordpress/docker-compose.yaml | 54 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 18 deletions(-)
 delete mode 100644 docker/mariadb/docker-compose.yaml
 create mode 100644 docker/wordpress/docker-compose.yaml

diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml
deleted file mode 100644
index e09fa124..00000000
--- a/docker/mariadb/docker-compose.yaml
+++ /dev/null
@@ -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
diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml
new file mode 100644
index 00000000..8db8cd1d
--- /dev/null
+++ b/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

From e26c386ee387eb1ef1501e89b2410247a9f617cf Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 30 Jan 2021 12:18:54 +0200
Subject: [PATCH 2/2] Update mko-laptop files

---
 config.yaml | 17 ++---------------
 dotdrop     |  2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/config.yaml b/config.yaml
index 09c49dec..c2186244 100644
--- a/config.yaml
+++ b/config.yaml
@@ -243,21 +243,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
diff --git a/dotdrop b/dotdrop
index 39d52a2c..900f705b 160000
--- a/dotdrop
+++ b/dotdrop
@@ -1 +1 @@
-Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f
+Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5