Merge pull request 'testing' (#3) from testing into main

Reviewed-on: #3

.env.sample

@@ -1,6 +1,6 @@
 MYSQL_ROOT_PASSWORD=PASSWORD
 
-MYSQL_DATABASE=gitea
+MYSQL_DATABASE=wordpress
 MYSQL_USER=DATABASEUSER
 MYSQL_PASSWORD=DATABASEPASSWORD
 

.gitignore

@@ -1,7 +1,5 @@
 .env
 
-data/plugins/*
-data/themes/*
-data/uploads/*
+data
 
 nginx-conf/nginx.conf

README.md

@@ -10,7 +10,7 @@ sample .env:
 
     MYSQL_ROOT_PASSWORD=PASSWORD
 
-    MYSQL_DATABASE=gitea
+    MYSQL_DATABASE=wordpress
     MYSQL_USER=DATABASEUSER
     MYSQL_PASSWORD=DATABASEPASSWORD
 

docker-compose.yml

@@ -2,14 +2,14 @@ version: '1'
 
 networks:
   default:
-    name: "${TRAEFIK_NETWORK}"
-    external: true
-  db:
     name: "${PROJECT_NAME}_wordpress_db_net"
     external: false
   be:
     name: "${PROJECT_NAME}_wordpress_net"
     external: false
+  traefik:
+    name: "${TRAEFIK_NETWORK}"
+    external: true
 
 services:
   webserver:
@@ -26,9 +26,8 @@ services:
       - "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/uploads:/var/www/html/wp-content/uploads"
       - "./nginx-conf:/etc/nginx/conf.d"
       - "./php-conf:/usr/local/etc/php"
-        #- ./wordpress-data/installer.php:/var/www/html/installer.php
-        #- ./wordpress-data/earthman_20231010_f058a22d5085e51c3204_20231010103457_archive.zip:/var/www/html/earthman_20231010_f058a22d5085e51c3204_20231010103457_archive.zip:ro
     networks:
+      - "traefik"
       - "be"
     labels:
       # Watchtower add to auto update
@@ -36,7 +35,6 @@ services:
       # traefik
       - "traefik.enable=true"
       - "traefik.docker.network=${TRAEFIK_NETWORK}"
-      #- "traefik.tcp.routers.${PROJECT_NAME}_sftp.rule=HostSNI(`${PROJECT_URL}`)" # tls
       - "traefik.http.services.${PROJECT_NAME}_wordpress.loadbalancer.server.port=80"
       - "traefik.http.routers.${PROJECT_NAME}_wordpress.rule=Host(`${PROJECT_URL}`)"
       - "traefik.http.routers.${PROJECT_NAME}_wordpress.entrypoints=websecure"
@@ -61,7 +59,7 @@ services:
       - "WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD}"
       - "WORDPRESS_DB_NAME=${MYSQL_DATABASE}"
     networks:
-      - "db"
+      - "default"
       - "be"
     labels:
       # Watchtower add to auto update
@@ -76,9 +74,7 @@ services:
     command: '--default-authentication-plugin=mysql_native_password'
     env_file: ".env"
     volumes: 
-      - "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db/:/var/lib/mysql"     
-    networks:
-      - "db" 
+      - "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db:/var/lib/mysql"
     labels:
       # Watchtower add to auto update
       - "com.centurylinklabs.watchtower.enable=true"

init

@@ -4,7 +4,7 @@ source ./.env
 source ./create_config
 
 mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/plugins
-mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress//themes
+mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/themes
 mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/uploads
 mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db