From 82d9b15339cebec79851a0fbfe1689a8b26242b0 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Mon, 4 Mar 2019 22:01:22 +0100 Subject: [PATCH 1/6] Fix typo --- doc/ariane.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ariane.md b/doc/ariane.md index 06976ee..0de4216 100644 --- a/doc/ariane.md +++ b/doc/ariane.md @@ -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 From 5958eeee2d73ca73ef04c1b7fde16641ebca71c4 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Sat, 6 Apr 2019 18:23:09 +0200 Subject: [PATCH 2/6] Add BORG_RELOCATED_REPO_ACCESS_IS_OK=y --- roles/borg_client/templates/check_job.sh.j2 | 1 + roles/borg_client/templates/create_job.sh.j2 | 3 ++- roles/borg_client/templates/prune_job.sh.j2 | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/borg_client/templates/check_job.sh.j2 b/roles/borg_client/templates/check_job.sh.j2 index ddcaf84..910d65f 100644 --- a/roles/borg_client/templates/check_job.sh.j2 +++ b/roles/borg_client/templates/check_job.sh.j2 @@ -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 }} diff --git a/roles/borg_client/templates/create_job.sh.j2 b/roles/borg_client/templates/create_job.sh.j2 index 08564b1..7b19d52 100644 --- a/roles/borg_client/templates/create_job.sh.j2 +++ b/roles/borg_client/templates/create_job.sh.j2 @@ -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 }} \ No newline at end of file + | /usr/bin/logger -t borgbackup_backup_{{ item.name }}_{{ borgbackup_client_backup_server }} diff --git a/roles/borg_client/templates/prune_job.sh.j2 b/roles/borg_client/templates/prune_job.sh.j2 index 5977439..4076f20 100644 --- a/roles/borg_client/templates/prune_job.sh.j2 +++ b/roles/borg_client/templates/prune_job.sh.j2 @@ -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 }} From a9758db7180514638cb0c0f53c91eec6f5bdfc7f Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Mon, 6 May 2019 17:51:38 +0200 Subject: [PATCH 3/6] Add molly-guard --- group_vars/fet_hosts | 1 + group_vars/fet_lxc_debian | 1 + 2 files changed, 2 insertions(+) diff --git a/group_vars/fet_hosts b/group_vars/fet_hosts index 75ca972..7ba8303 100644 --- a/group_vars/fet_hosts +++ b/group_vars/fet_hosts @@ -29,6 +29,7 @@ common_basic_packages: - gdisk - lshw - nvme-cli + - molly-guard common_sysctl: True common_sysctls: diff --git a/group_vars/fet_lxc_debian b/group_vars/fet_lxc_debian index 15cac8e..9cc165a 100644 --- a/group_vars/fet_lxc_debian +++ b/group_vars/fet_lxc_debian @@ -22,3 +22,4 @@ common_basic_packages: - lsb-release - python3-apt - python3-pycurl + - molly-guard From 7ec19748058b194e7b2aa55b2eab8b0e316635ea Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Mon, 6 May 2019 17:52:10 +0200 Subject: [PATCH 4/6] Add fetsite and rev 2 --- host_vars/ariane | 11 +++++++++++ hosts/production | 3 +++ 2 files changed, 14 insertions(+) diff --git a/host_vars/ariane b/host_vars/ariane index 9f21d9d..d3a57e2 100644 --- a/host_vars/ariane +++ b/host_vars/ariane @@ -102,5 +102,16 @@ lxc: - lxc.network.hwaddr = 2e:6d:b6:07:10:01 - lxc.network.link = br1 - lxc.network.flags = up + - lxc.mount.entry = /zv1/andis /var/lib/lxc/lxc-fetsite-01/rootfs/srv/ none bind,create=dir 0 0 + + - name: fetsite + revision: "02" + template: debian + config: + - lxc.network.type = veth + - lxc.network.hwaddr = 2e:6d:b6:07:10:02 + - lxc.network.link = br1 + - lxc.network.flags = up + - lxc.mount.entry = /zv1/andis /var/lib/lxc/lxc-fetsite-02/rootfs/srv/ none bind,create=dir 0 0 common_zfs: True diff --git a/hosts/production b/hosts/production index 03f59e7..f9d06a4 100644 --- a/hosts/production +++ b/hosts/production @@ -8,6 +8,9 @@ all: betam: proteus: juri: + alekse: + wostok: + fetsite: fet_lxc_void: hosts: sputnik: From a20c7a31e7ae87c1d9bf18a37eb7c907f7669181 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Mon, 6 May 2019 18:25:02 +0200 Subject: [PATCH 5/6] Add fetsite host --- host_vars/fetsite | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 host_vars/fetsite diff --git a/host_vars/fetsite b/host_vars/fetsite new file mode 100644 index 0000000..d6807dd --- /dev/null +++ b/host_vars/fetsite @@ -0,0 +1,3 @@ +inventory_hostname: fetsite.fet.htu.tuwien.ac.at +inventory_hostname_short: fetsite + From eba85f767d48a51a40a2680fd3eed47c3928cdf6 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Mon, 6 May 2019 18:25:43 +0200 Subject: [PATCH 6/6] Fix xbps building --- roles/ariane/tasks/lxc_void.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ariane/tasks/lxc_void.yml b/roles/ariane/tasks/lxc_void.yml index 8c1c615..ac7bc7c 100644 --- a/roles/ariane/tasks/lxc_void.yml +++ b/roles/ariane/tasks/lxc_void.yml @@ -15,7 +15,7 @@ register: git_clone - name: lxc - xbps build and install - shell: cd /opt/xbps && /opt/xbps/configure --enable-debug && make && make install clean && ldconfig + shell: cd /opt/xbps && /opt/xbps/configure && make && make install clean && ldconfig when: git_clone.changed - name: lxc - /usr/share/lxc/templates/lxc-voidlinux