Merge pull request #689 from tomandegg/feature/general-setup

Developer setup improvements and custom file handling

Author: Slyke

.gitignore

@@ -5,6 +5,7 @@
 /.tmp/*
 __pycache__
 docker-compose.yml
+docker-compose.override.yml
 compose-override.yml
 build-installer.sh
 docker-compose-base.yml
@@ -25,5 +26,6 @@ post_restore.sh
 !.gitkeep
 
 .vscode
+.idea
 *.code-workspace
 

scripts/backup.sh

@@ -90,6 +90,7 @@ bash ./scripts/backup_restore/pre_backup_complete.sh >> $LOGFILE 2>&1
 echo "./services/" >> $BACKUPLIST
 echo "./volumes/" >> $BACKUPLIST
 [ -f "./docker-compose.yml" ] && echo "./docker-compose.yml" >> $BACKUPLIST
+[ -f "./docker-compose.override.yml" ] && echo "./docker-compose.yml" >> $BACKUPLIST
 [ -f "./compose-override.yml" ] && echo "./compose-override.yml" >> $BACKUPLIST
 [ -f "./extra" ] && echo "./extra" >> $BACKUPLIST
 [ -f "./.tmp/databases_backup" ] && echo "./.tmp/databases_backup" >> $BACKUPLIST