Skip to content

Commit f6bf299

Browse files
tiredofittiredofit
committed
Add seperate persmissions for _FILESYSTEM_PATH
1 parent 5cf00a8 commit f6bf299

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

‎README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,13 @@ Options that are related to the value of `DEFAULT_BACKUP_LOCATION`
322322

323323
If `DEFAULT_BACKUP_LOCTION` = `FILESYSTEM` then the following options are used:
324324

325-
| Variable | Description | Default |
326-
| --------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------------------- |
327-
| `DEFAULT_CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE` |
328-
| `DEFAULT_FILESYSTEM_PATH` | Directory where the database dumps are kept. | `/backup` |
329-
| `DEFAULT_FILESYSTEM_ARCHIVE_PATH` | Optional Directory where the database dumps archives are kept | `${DEFAULT_FILESYSTEM_PATH}/archive/` |
330-
| `DEFAULT_FILESYSTEM_PERMISSION` | Directory and File permissions to apply to files. | `600` |
325+
| Variable | Description | Default |
326+
| ------------------------------------ | ----------------------------------------------------------------------------------------------------- | ------------------------------------- |
327+
| `DEFAULT_CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE` |
328+
| `DEFAULT_FILESYSTEM_PATH` | Directory where the database dumps are kept. | `/backup` |
329+
| `DEFAULT_FILESYSTEM_PATH_PERMISSION` | Permissions to apply to backup directory | `700` |
330+
| `DEFAULT_FILESYSTEM_ARCHIVE_PATH` | Optional Directory where the database dumps archives are kept | `${DEFAULT_FILESYSTEM_PATH}/archive/` |
331+
| `DEFAULT_FILESYSTEM_PERMISSION` | Permissions to apply to files. | `600` |
331332

332333
###### S3
333334

@@ -492,7 +493,7 @@ Encryption will occur after compression and the resulting filename will have a `
492493
| | Absolute HHMM, e.g. `2330` or `0415` | |
493494
| | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half | |
494495
| | Full datestamp e.g. `2023-12-21 23:30:00` | |
495-
| | Cron expression e.g. `30 23 * * *` [Understand the format](https://en.wikipedia.org/wiki/Cron) - *BACKUP_INTERVAL is ignored* | |
496+
| | Cron expression e.g. `30 23 * * *` [Understand the format](https://en.wikipedia.org/wiki/Cron) - *BACKUP_INTERVAL is ignored* | |
496497
| `DB01_CLEANUP_TIME` | Value in minutes to delete old backups (only fired when backup interval executes) | `FALSE` |
497498
| | 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | |
498499
| `DB01_ARCHIVE_TIME` | Value in minutes to move all files files older than (x) from `DB01_BACKUP_FILESYSTEM_PATH` | |
@@ -597,12 +598,13 @@ Options that are related to the value of `DB01_BACKUP_LOCATION`
597598

598599
If `DB01_BACKUP_LOCTION` = `FILESYSTEM` then the following options are used:
599600

600-
| Variable | Description | Default |
601-
| ------------------------------ | ----------------------------------------------------------------------------------------------------- | --------------------------------- |
602-
| `DB01_CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE` |
603-
| `DB01_FILESYSTEM_PATH` | Directory where the database dumps are kept. | `/backup` |
604-
| `DB01_FILESYSTEM_ARCHIVE_PATH` | Optional Directory where the database dumps archives are kept | `${DB01_FILESYSTEM_PATH/archive/` |
605-
| `DB01_FILESYSTEM_PERMISSION` | Directory and File permissions to apply to files. | `600` |
601+
| Variable | Description | Default |
602+
| --------------------------------- | ----------------------------------------------------------------------------------------------------- | --------------------------------- |
603+
| `DB01_CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE` |
604+
| `DB01_FILESYSTEM_PATH` | Directory where the database dumps are kept. | `/backup` |
605+
| `DB01_FILESYSTEM_PATH_PERMISSION` | Permissions to apply to backup directory | `700` |
606+
| `DB01_FILESYSTEM_ARCHIVE_PATH` | Optional Directory where the database dumps archives are kept | `${DB01_FILESYSTEM_PATH/archive/` |
607+
| `DB01_FILESYSTEM_PERMISSION` | Directory and File permissions to apply to files. | `600` |
606608

607609
###### S3
608610

‎install/assets/defaults/10-db-backup

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BACKUP_JOB_CONCURRENCY=${BACKUP_JOB_CONCURRENCY:-"1"}
44
DBBACKUP_USER=${DBBACKUP_USER:-"dbbackup"}
5-
DBBACKUP_GROUP=${DBBACKUP_USER:-"${DBBACKUP_USER}"} # Must go after DBBACKUP_USER
5+
DBBACKUP_GROUP=${DBBACKUP_GROUP:-"${DBBACKUP_USER}"} # Must go after DBBACKUP_USER
66
DEFAULT_BACKUP_BEGIN=${DEFAULT_BACKUP_BEGIN:-+0}
77
DEFAULT_BACKUP_INTERVAL=${DEFAULT_BACKUP_INTERVAL:-1440}
88
DEFAULT_BACKUP_INTERVAL=${DEFAULT_BACKUP_INTERVAL:-1440}
@@ -15,6 +15,7 @@ DEFAULT_CREATE_LATEST_SYMLINK=${DEFAULT_CREATE_LATEST_SYMLINK:-"TRUE"}
1515
DEFAULT_ENABLE_PARALLEL_COMPRESSION=${DEFAULT_ENABLE_PARALLEL_COMPRESSION:-"TRUE"}
1616
DEFAULT_ENCRYPT=${DEFAULT_ENCRYPT:-"FALSE"}
1717
DEFAULT_FILESYSTEM_PATH=${DEFAULT_FILESYSTEM_PATH:-"/backup"}
18+
DEFAULT_FILESYSTEM_PATH_PERMISSION=${DEFAULT_FILESYSTEM_PATH_PERMISSION:-"700"}
1819
DEFAULT_FILESYSTEM_PERMISSION=${DEFAULT_FILESYSTEM_PERMISSION:-"600"}
1920
DEFAULT_FILESYSTEM_ARCHIVE_PATH=${DEFAULT_FILESYSTEM_ARCHIVE_PATH:-"${DEFAULT_FILESYSTEM_PATH}/archive/"}
2021
DEFAULT_LOG_LEVEL=${DEFAULT_LOG_LEVEL:-"notice"}

‎install/assets/functions/10-db-backup

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ bootstrap_filesystem() {
66
mkdir -p "${backup_job_filesystem_path}"
77
fi
88
if [ "$(stat -c %U "${backup_job_filesystem_path}")" != "${DBBACKUP_USER}" ] ; then chown -R "${DBBACKUP_USER}":"${DBBACKUP_GROUP}" "${backup_job_filesystem_path}" ; fi
9-
if [ "$(stat -c %a "${backup_job_filesystem_path}")" != "${backup_job_filesystem_permission}" ] ; then chmod -R "${backup_job_filesystem_permission}" "${backup_job_filesystem_path}" ; fi
9+
if [ "$(stat -c %a "${backup_job_filesystem_path}")" != "${backup_job_filesystem_path_permission}" ] ; then chmod "${backup_job_filesystem_path_permission}" "${backup_job_filesystem_path}" ; fi
1010

1111
if [ -d "${backup_job_filesystem_archive_path}" ]; then
1212
if [ "$(stat -c %U "${backup_job_filesystem_archive_path}")" != "${DBBACKUP_USER}" ] ; then chown -R "${DBBACKUP_USER}":"${DBBACKUP_GROUP}" "${backup_job_filesystem_archive_path}" ; fi
13-
if [ "$(stat -c %a "${backup_job_filesystem_archive_path}")" != "${backup_job_filesystem_permission}" ] ; then chmod -R "${backup_job_filesystem_permission}" "${backup_job_filesystem_archive_path}" ; fi
13+
if [ "$(stat -c %a "${backup_job_filesystem_archive_path}")" != "${backup_job_filesystem_path_permission}" ] ; then chmod "${backup_job_filesystem_path_permission}" "${backup_job_filesystem_archive_path}" ; fi
1414
fi
1515

1616
if [ ! -d "${LOG_PATH}" ]; then
@@ -191,6 +191,7 @@ bootstrap_variables() {
191191
transform_backup_instance_variable "${backup_instance_number}" EXTRA_OPTS backup_job_extra_opts
192192
transform_backup_instance_variable "${backup_instance_number}" FILESYSTEM_ARCHIVE_PATH backup_job_filesystem_archive_path
193193
transform_backup_instance_variable "${backup_instance_number}" FILESYSTEM_PATH backup_job_filesystem_path
194+
transform_backup_instance_variable "${backup_instance_number}" FILESYSTEM_PATH_PERMISSION backup_job_filesystem_path_permission
194195
transform_backup_instance_variable "${backup_instance_number}" FILESYSTEM_PERMISSION backup_job_filesystem_permission
195196
transform_backup_instance_variable "${backup_instance_number}" GZ_RSYNCABLE backup_job_gz_rsyncable
196197
transform_backup_instance_variable "${backup_instance_number}" HOST backup_job_db_host
@@ -459,12 +460,7 @@ backup_couch() {
459460
prepare_dbbackup
460461
backup_job_filename=couch_${backup_job_db_name}_${backup_job_db_host#*//}_${now}.txt
461462
backup_job_filename_base=couch_${backup_job_db_name}_${backup_job_db_host#*//}
462-
compression
463-
pre_dbbackup ${backup_job_db_name}
464-
write_log notice "Dumping CouchDB database: '${backup_job_db_name}' ${compression_string}"
465-
if var_true "${DEBUG_BACKUP_COUCH}" ; then debug on; fi
466-
run_as_user curl -sSL -X GET ${backup_job_db_host}:${backup_job_db_port}/${backup_job_db_name}/_all_docs?include_docs=true | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
467-
exit_code=$?
463+
compressionzyclonite
468464
if var_true "${DEBUG_BACKUP_COUCH}" ; then debug off; fi
469465
check_exit_code backup "${backup_job_filename}"
470466
timer backup finish
@@ -847,7 +843,7 @@ backup_sqlite3() {
847843
pre_dbbackup "${db}"
848844
write_log notice "Dumping sqlite3 database: '${backup_job_db_host}' ${compression_string}"
849845
if var_true "${DEBUG_BACKUP_SQLITE3}" ; then debug on; fi
850-
silent run_as_user ${play_fair} sqlite3 "${backup_job_db_host}" ".backup '${TEMP_PATH}/backup.sqlite3'"
846+
silent run_as_user ${play_fair} sqlite3 "${backup_job_db_host}" ".backup ${TEMP_PATH}/backup.sqlite3"
851847
exit_code=$?
852848
check_exit_code backup "${backup_job_filename}"
853849
run_as_user ${play_fair} cat "${TEMP_PATH}"/backup.sqlite3 | ${dir_compress_cmd} | run_as_user tee "${TEMP_PATH}/${backup_job_filename}" > /dev/null

0 commit comments

Comments
 (0)