Various adjustments

Author: adamgilbert

CHANGELOG.md

@@ -6,10 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [v0.1.15] - 2018-11-19
 ### Added
-- Add customizable log driver option
-- Add postgres-backup container
-- Add host cron job for postgres backups
-- Add security label disable for selinux based systems
+- Customizable log driver option
+- Postgres-backup container
+- Host cron job for postgres backups
+- Security label disable for selinux based systems
 
 ## [v0.1.14] - 2018-11-08
 ### Added

README.md

@@ -88,15 +88,17 @@ The [Moodle eMailTest](https://moodle.org/plugins/local_mailtest) plugin is bake
     openssl req -x509 -newkey rsa:4096 -keyout moodle.key -out moodle.crt -days 365 -nodes -subj "/C=CA/ST=ON/L=Toronto/O=SC/OU=Org/CN=www.example.com"
     ```
 
-## Manual backups
+## Backup and Restore
+
+### Manual backups
 
 On systems installed from .deb package, a cronjob should be automatically setup to perform backups.  On a development system, you can manually run the same process:
 
 ```
 docker-compose run postgres-backup /bin/backup_db
 ```
 
-## Restoring a database backup
+### Restoring a database backup
 
 First, ensure you have a backup and delta to restore from!  On systems installed from .deb package, the files are stored on the docker host under /backups by default.
 

systemd/postgres-backup renamed to cron/postgres-backup

@@ -70,7 +70,7 @@ services:
       - "/package/dc.prod-dbonly.yml=/etc/moodle-docker/"
       - "/package/docker-compose.yml=/etc/moodle-docker/"
       - "/package/systemd/moodle-docker.service=/lib/systemd/system/"
-      - "/package/systemd/postgres-backup=/etc/cron.d/"
+      - "/package/cron/postgres-backup=/etc/cron.d/"
     environment:
       BUILD_VERSION: "${BUILD_VERSION}"
       MOODLE_VERSION: "${MOODLE_VERSION}"

dc.deb.yml

@@ -11,7 +11,6 @@ x-secopts:
     security_opt:
       - label:disable
 
-
 services:
   nginx-php-moodle:
     networks:
@@ -93,7 +92,9 @@ services:
     depends_on:
       - "postgres"
     volumes:
-      - ${MOODLE_BACKUP_ROOT}:/backup:Z
+      - type: bind
+        source: ${MOODLE_BACKUP_ROOT}
+        target: /backup
     environment:
       POSTGRES_PASSWORD: "${PGSQL_PASSWORD}"
       POSTGRES_USER: "${PGSQL_USER}"