diff --git a/Makefile b/Makefile index 15ddd99..29f77f1 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,11 @@ DOCKER := docker -PROFILES := webserver database wordpress adminer +PROFILES := webserver database wordpress adminer uptime-kuma PROFILE_CMD := $(addprefix --profile ,$(PROFILES)) -COMPOSE_FILES := $(shell find docker-compose* | sed -e 's/^/--file /') +COMPOSE_FILES := $(shell find docker-compose*.yml | sed -e 's/^/--file /') AUTHOR := bensuperpc diff --git a/caddy/wordpress/Caddyfile b/caddy/wordpress/Caddyfile index 2dd2389..29e38bd 100644 --- a/caddy/wordpress/Caddyfile +++ b/caddy/wordpress/Caddyfile @@ -18,7 +18,7 @@ www.bensuperpc.org { respond /uploads/*.php 404 log { - output stdout + output file /data/logs/access.log format console } } @@ -31,6 +31,10 @@ adminer.bensuperpc.org { reverse_proxy adminer:8080 } +uptimekuma.bensuperpc.org { + reverse_proxy uptime-kuma:3001 +} + bensuperpc.com { redir https://www.bensuperpc.org{uri} permanent } diff --git a/docker-compose.yml b/docker-compose.yml index 0a22443..96a072c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,8 @@ services: container_name: database profiles: - database + depends_on: + - caddy restart: on-failure volumes: - database:/var/lib/mysql:rw @@ -28,6 +30,7 @@ services: restart: on-failure depends_on: - database + - caddy env_file: - env/wordpress.env volumes: @@ -69,6 +72,7 @@ services: - env/adminer.env depends_on: - database + - caddy networks: - blog-network security_opt: @@ -80,6 +84,21 @@ services: # cap_add: # - CHOWN + uptime-kuma: + image: louislam/uptime-kuma:1 + container_name: uptime-kuma + profiles: + - uptime-kuma + depends_on: + - caddy + volumes: + - uptimekuma_data:/app/data + restart: always + networks: + - blog-network + security_opt: + - no-new-privileges:true + networks: blog-network: driver: bridge @@ -94,3 +113,5 @@ volumes: name: caddy_data caddy_config: name: caddy_config + uptimekuma_data: + name: uptimekuma_data diff --git a/env/wordpress.env b/env/wordpress.env index 1c22756..7f8a95e 100644 --- a/env/wordpress.env +++ b/env/wordpress.env @@ -1,4 +1,4 @@ WORDPRESS_DB_USER=bensuperpc WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw WORDPRESS_DB_NAME=wordpress -WORDPRESS_DB_HOST=database:3306 +WORDPRESS_DB_HOST=database:3306 \ No newline at end of file diff --git a/php.ini b/php.ini index 02fa3b8..94d7553 100644 --- a/php.ini +++ b/php.ini @@ -1,3 +1,3 @@ -memory_limit = 1024M +memory_limit = 2048M upload_max_filesize = 128M post_max_size = 128M