Merge branch 'master' into fetlab

This commit is contained in:
Daniel A. Maierhofer
2019-05-08 14:21:36 +02:00
4 changed files with 5 additions and 2 deletions

View File

@@ -97,7 +97,7 @@ mv /var/lib/lxc/* /ssd/var/lxc/
zfs set mountpoint=/var/lib/lxc ssd/var/lxc
zfs create -o com.sun:auto-snapshot=false zv1/laika
zfs create -o com.sun:auto-snapshot=false zv1/daten/Scans
zfs create -o setuid=off -o zv1/zyklon
zfs create -o setuid=off zv1/zyklon
chown 997:996 /zv1/zyklon
```
### Set dataset quota

View File

@@ -4,6 +4,7 @@ set -e
export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }}"
export BORG_PASSPHRASE="{{ borgbackup_passphrase }}"
export BORG_RELOCATED_REPO_ACCESS_IS_OK=y
REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfreebackup | default(borgbackup_client_backup_server) }}:{{ item.name }}

View File

@@ -4,6 +4,7 @@ set -e
export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }}"
export BORG_PASSPHRASE="{{ borgbackup_passphrase }}"
export BORG_RELOCATED_REPO_ACCESS_IS_OK=y
REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfreebackup | default(borgbackup_client_backup_server) }}:{{ item.name }}
@@ -15,4 +16,4 @@ REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfr
--exclude '{{ e }}' \
{% endfor %}
2>&1 | tee {{ borgbackup_client_lastlog_dir }}/{{ item.name }}_{{ create_suffix_script_filename }}.lastlog \
| /usr/bin/logger -t borgbackup_backup_{{ item.name }}_{{ borgbackup_client_backup_server }}
| /usr/bin/logger -t borgbackup_backup_{{ item.name }}_{{ borgbackup_client_backup_server }}

View File

@@ -4,6 +4,7 @@ set -e
export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }}"
export BORG_PASSPHRASE="{{ borgbackup_passphrase }}"
export BORG_RELOCATED_REPO_ACCESS_IS_OK=y
REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfreebackup | default(borgbackup_client_backup_server) }}:{{ item.name }}