Merge pull request 'cleanup' (#2) from testing into main

Reviewed-on: #2
This commit is contained in:
rama 2023-11-25 15:12:27 +01:00
commit c0f1e956dd
2 changed files with 2 additions and 5 deletions

View File

@ -26,8 +26,6 @@ services:
- "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/uploads:/var/www/html/wp-content/uploads" - "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/uploads:/var/www/html/wp-content/uploads"
- "./nginx-conf:/etc/nginx/conf.d" - "./nginx-conf:/etc/nginx/conf.d"
- "./php-conf:/usr/local/etc/php" - "./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: networks:
- "be" - "be"
labels: labels:
@ -36,7 +34,6 @@ services:
# traefik # traefik
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=${TRAEFIK_NETWORK}" - "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.services.${PROJECT_NAME}_wordpress.loadbalancer.server.port=80"
- "traefik.http.routers.${PROJECT_NAME}_wordpress.rule=Host(`${PROJECT_URL}`)" - "traefik.http.routers.${PROJECT_NAME}_wordpress.rule=Host(`${PROJECT_URL}`)"
- "traefik.http.routers.${PROJECT_NAME}_wordpress.entrypoints=websecure" - "traefik.http.routers.${PROJECT_NAME}_wordpress.entrypoints=websecure"
@ -76,7 +73,7 @@ services:
command: '--default-authentication-plugin=mysql_native_password' command: '--default-authentication-plugin=mysql_native_password'
env_file: ".env" env_file: ".env"
volumes: volumes:
- "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db/:/var/lib/mysql" - "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db:/var/lib/mysql"
networks: networks:
- "db" - "db"
labels: labels:

2
init
View File

@ -4,7 +4,7 @@ source ./.env
source ./create_config source ./create_config
mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/wordpress/plugins 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/wordpress/uploads
mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db