Merge branch 'gitlab-stop-using-backup-tool' into 'master'

gitlab: Do away with generating tarball backups

See merge request !530

docs/backups.md

@@ -85,10 +85,6 @@ For PostgreSQL backups are made using pg_dump to `postgres_backup_dir`.
 
 Restoring backups can be done with `pg_restore`. See also [official PostgreSQL docs](https://www.postgresql.org/docs/current/app-pgrestore.html).
 
-### Gitlab
-
-GitLab is backupped up using the `gitlab_backup` tool to `gitlab_backupdir`. See also [official GitLab docs](https://docs.gitlab.com/ee/raketasks/backup_restore.html).
-
 ## Adding a new server
 
 Adding a new server to be backed up goes as follows:

host_vars/gitlab.archlinux.org/misc

 ---
 filesystem: btrfs
-gitlab_backupdir: /srv/gitlab/data/backups
 additional_addresses: ["116.203.6.156/32", "2a01:4f8:c2c:5d2d::2/64"]
 wireguard_address: 10.0.0.5
 wireguard_public_key: EbZisS0fwM6B8Nkugy1lyox+A8L13hniucVIPVCK5R0=

roles/borg_client/tasks/main.yml

@@ -56,10 +56,6 @@
   file: path={{ mysql_backup_dir }} state=directory owner=root group=root mode=0755
   when: mysql_backup_dir is defined
 
-- name: install gitlab backup script
-  template: src=backup-gitlab.sh.j2 dest=/usr/local/bin/backup-gitlab.sh owner=root group=root mode=0755
-  when: inventory_hostname == "gitlab.archlinux.org"
-
 - name: install systemd services for backup
   template: src={{ item }}.j2 dest=/etc/systemd/system/{{ item }} owner=root group=root mode=0644
   with_items:

roles/borg_client/templates/backup-gitlab.sh.j2

-#!/bin/bash
-#
-# Script to backup Gitlab running in a Docker container
-#
-# https://docs.gitlab.com/omnibus/settings/backups.html#creating-backups-for-gitlab-instances-in-docker-containers
-#
-
-backupdir="{{ gitlab_backupdir }}"
-
-echo "emptying backup directory ${backupdir}"
-
-# Verify that the gitlab_backupdir in ansible was defined, otherwise we will rm /* and remove the previous backup
-rm -r "${backupdir:?backup dir unset}/"*
-
-docker exec gitlab gitlab-backup create STRATEGY=copy SKIP=tar GZIP_RSYNCABLE=yes

roles/borg_client/templates/borg-backup.service.j2

 [Unit]
 Description=Borg backup
 
-{% if inventory_hostname == "gitlab.archlinux.org" %}
-# The ordering relation defined below is important for the GitLab backups
-# because the offsite backup reuses the tarballs from this service's run.
-{% endif %}
 Wants=borg-backup-offsite.service
 Before=borg-backup-offsite.service
 

roles/borg_client/templates/borg-backup.sh.j2

@@ -45,12 +45,6 @@ if systemctl is-active mysqld || systemctl is-active mariadb; then
     /usr/local/bin/backup-mysql.sh || true
 fi
 
-{# When backing up to offsite, reuse the existing tarballs from the previous backup #}
-{% if inventory_hostname == "gitlab.archlinux.org" and item['suffix'] != '-offsite' %}
-# Create tarball backups of various GitLab directories using the official backup tool
-systemctl is-active docker && /usr/local/bin/backup-gitlab.sh
-{% endif %}
-
 if is_btrfs "$src"; then
     # List all btrfs submounts we want to backup, e.g. homedir.archlinux.org with "/ /home"
     list_of_btrfs_submounts=$(findmnt -Rl -o target,fstype,options / | grep btrfs | grep -v docker | grep -v "subvol=\/[[:alnum:]]" | cut -d ' ' -f1)

roles/gitlab/defaults/main.yml

-gitlab_backupdir: /srv/gitlab/data/backups