diff --git a/config.yaml b/config.yaml index 3be400f8..317ddafc 100644 --- a/config.yaml +++ b/config.yaml @@ -235,8 +235,21 @@ profiles: - terminal - Pacman mko-laptop: - include: - - terminal + 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 Edoras: include: - terminal diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml new file mode 100644 index 00000000..e09fa124 --- /dev/null +++ b/docker/mariadb/docker-compose.yaml @@ -0,0 +1,18 @@ +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 deleted file mode 100644 index 8db8cd1d..00000000 --- a/docker/wordpress/docker-compose.yaml +++ /dev/null @@ -1,54 +0,0 @@ -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