H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from Marwolf/master

Browse Source 
Latest MariaDB container, DB backups now zip
This commit is contained in:
Marwolf
2018-08-20 07:36:40 -04:00
committed by GitHub
parent 39f4cd4ae0 306e39e07a
commit 6efaf1f5e7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -57,7 +57,7 @@ logs:
backup: backup:
@sudo mkdir -p $(MYSQL_DUMPS_DIR) @sudo mkdir -p $(MYSQL_DUMPS_DIR)
@$(shell sudo chmod -R 777 $(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: backup-windows:
@docker exec -i mysql mysqldump --all-databases -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql @docker exec -i mysql mysqldump --all-databases -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql

2
docker-compose.yml
View File

@@ -20,7 +20,7 @@ services:
- mysqldb - mysqldb
myadmin: myadmin:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin:latest
container_name: phpmyadmin container_name: phpmyadmin
ports: ports:
- "9000:80" - "9000:80"

6
etc/nginx/HTTPS_default.conf.BAK
View File

@@ -42,9 +42,9 @@ server {
ssl_stapling on; ssl_stapling on;
ssl_stapling_verify on; ssl_stapling_verify on;
resolver 8.8.8.8 1.1.1.1; resolver 8.8.8.8 1.1.1.1;
ssl_certificate /etc/letsencrypt/live/wolfkingdom.net/fullchain.pem; ssl_certificate /etc/letsencrypt/live/openrsc.com/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/wolfkingdom.net/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/openrsc.com/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/wolfkingdom.net/chain.pem; ssl_trusted_certificate /etc/letsencrypt/live/openrsc.com/chain.pem;
root /app; root /app;
index index.jsp index.html index.htm; index index.jsp index.html index.htm;