From 7c79d02ebe4cddc0ed3123c0bcdaf5133db57bf6 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sun, 19 Aug 2018 14:37:54 -0400 Subject: [PATCH 1/2] Changed domain to openrsc.com --- etc/nginx/HTTPS_default.conf.BAK | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/nginx/HTTPS_default.conf.BAK b/etc/nginx/HTTPS_default.conf.BAK index 96fb245..a312b67 100755 --- a/etc/nginx/HTTPS_default.conf.BAK +++ b/etc/nginx/HTTPS_default.conf.BAK @@ -42,9 +42,9 @@ server { ssl_stapling on; ssl_stapling_verify on; resolver 8.8.8.8 1.1.1.1; - ssl_certificate /etc/letsencrypt/live/wolfkingdom.net/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/wolfkingdom.net/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/wolfkingdom.net/chain.pem; + ssl_certificate /etc/letsencrypt/live/openrsc.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/openrsc.com/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/openrsc.com/chain.pem; root /app; index index.jsp index.html index.htm; From 306e39e07a35d15ab451ae36b020ff33f0b07b52 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Mon, 20 Aug 2018 07:35:45 -0400 Subject: [PATCH 2/2] Latest MariaDB container, DB backups now zip --- Makefile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bbcefa3..d28f11c 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ logs: backup: @sudo mkdir -p $(MYSQL_DUMPS_DIR) @$(shell sudo chmod -R 777 $(MYSQL_DUMPS_DIR)) - docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/"Backup `date "+%Y-%m-%d %H:%M %Z"`.sql" + docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" | gzip > $(MYSQL_DUMPS_DIR)/`date "+%Y%m%d %H%M %Z"`.sql.zip backup-windows: @docker exec -i mysql mysqldump --all-databases -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql diff --git a/docker-compose.yml b/docker-compose.yml index a5c6f33..21f8f69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: - mysqldb myadmin: - image: phpmyadmin/phpmyadmin + image: phpmyadmin/phpmyadmin:latest container_name: phpmyadmin ports: - "9000:80"