Merge pull request #37 from mila-iqia/repos_templates_etc

Add Bareos 23 capability, templates upgrades, fixes

Author: pbouchez

.github/workflows/molecule.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         distro:
-          - debian-systemd:bullseye
+          - debian-systemd:bookworm
 
     env:
       MOLECULE_DISTRO: ${{ matrix.distro }}

README.md

@@ -17,6 +17,7 @@ __Note:__ More options can be seen in `defaults/main.yml`
 - `bareos_director` - If you need to override backup director IP address on your client's /etc/hosts
 - `bareos_repo` - Defaults to Bareos Community Repository. Can be changed to use the Bareos Subscription Repository
 - `bareos_sd_max_concurrent_jobs` - [Optional] SD-level maximum concurrent jobs, defaults to 50
+- `bareos_catalog_backup_script` - You need to set it to `/usr/lib/bareos/scripts/make_catalog_backup` if using Bareos >=23
 ```
 bareos_director:
   ip: 10.0.0.1
@@ -86,7 +87,7 @@ bareos_pools:
 bareos_dir_storage:
   - name: FileFoo
     device: FileStorageFoo
-    bareos_dir_ip: 10.0.0.1
+    bareos_sd_ip: 10.0.0.1
     media_type: File2                   # optional, defaults to 'File'
     max_concurrent_jobs: 42             # optional, defaults to '50'
 ```
@@ -97,7 +98,7 @@ bareos_dir_storage:
     devices:
         - FileStorageFoo
         - FileStorageBar
-    bareos_dir_ip: 10.0.0.1
+    bareos_sd_ip: 10.0.0.1
     media_type: File2                   # optional, defaults to 'File'
     max_concurrent_jobs: 42             # optional, defaults to '50'
 ```
@@ -161,7 +162,7 @@ __NOTES:__
 Some tasks will be delegated from backup server to this client
 - `enable_backup_job` - Will create backup job `DefaultJobLinux`
 - `state` - When set to `absent`, client will be removed from server config (default: `present`)
-- `autostart` - Schedule first backup right away (default: `true`)
+- `autostart` - Schedule first backup right away (default: `false`)
 - `director_ip` - [Optional] Same as `bareos_director`, just different place to setup
 - `director_name` - [Optional] Same as `bareos_director`, just different place to setup
 

defaults/main.yml

@@ -1,13 +1,15 @@
 ---
-bareos_release: 21
-bareos_db_package: postgresql-12
+bareos_release: 23
+bareos_db_package: postgresql-15
 bareos_install_client: false
 bareos_install_server: false
 bareos_register_clients: true
 bareos_email: 'root@localhost'
 
 # Defaults to Bareos Community Repository
 bareos_repo: "https://download.bareos.org/current/{{ bareos_os_version }}"
+bareos_repo_key: "{{ bareos_repo }}/Release.key"
+bareos_repository: "deb {{ bareos_repo }}/ /"
 # Bareos Subscription Repository
 # bareos_repo: "http://download.bareos.com/bareos/release/{{ bareos_release }}/{{ bareos_os_version }}"
 
@@ -35,3 +37,4 @@ bareos_apt_monitoring_packages:
   - python3-psycopg2
   - python3-mysqldb
   - gpg
+bareos_catalog_backup_script: /usr/lib/bareos/scripts/make_catalog_backup.pl

meta/main.yml

@@ -5,7 +5,7 @@ galaxy_info:
   namespace: mila
   description: Role for managing bareos server & clients
   license: MIT
-  min_ansible_version: '2.14'
+  min_ansible_version: '2.16'
   platforms:
     - name: Debian
       versions:

molecule/default/molecule.yml

@@ -5,14 +5,14 @@ driver:
   name: docker
 platforms:
   - name: server
-    image: "quay.io/actatux/${MOLECULE_DISTRO:-debian-systemd:bullseye}"
+    image: "quay.io/actatux/${MOLECULE_DISTRO:-debian-systemd:bookworm}"
     override_command: false
     privileged: true
     pre_build_image: true
     groups:
       - servers
   - name: client
-    image: "quay.io/actatux/${MOLECULE_DISTRO:-debian-systemd:bullseye}"
+    image: "quay.io/actatux/${MOLECULE_DISTRO:-debian-systemd:bookworm}"
     override_command: false
     privileged: true
     pre_build_image: true

tasks/bareos_server.yml

@@ -13,12 +13,6 @@
     line: '  dbpassword = "{{ bareos_postgres_pass }}"'
   when: bareos_postgres_pass is defined
 
-- name: Remove dbaddress from catalog configuration
-  ansible.builtin.lineinfile:
-    path: /etc/bareos/bareos-dir.d/catalog/MyCatalog.conf
-    regexp: '^  dbaddress ='
-    state: absent
-
 - name: Ensure bareos postgresql is installed
   apt:
     name: bareos-database-postgresql
@@ -39,6 +33,14 @@
 - name: Setup bareos DB
   when: bareos_setup_db
   block:
+    - name: Recursively change bareos-dir directory ownership group to postgres
+      ansible.builtin.file:
+        path: "/etc/bareos/bareos-dir.d/"
+        state: directory
+        recurse: true
+        group: postgres
+      changed_when: false
+
     - name: Check that bareos DB exists
       shell: psql -lqt | cut -d \| -f 1 | grep -qw bareos
       become: true
@@ -56,6 +58,14 @@
         /usr/lib/bareos/scripts/grant_bareos_privileges
       when: _bareos_db_exists.rc != 0
 
+    - name: Recursively change bareos-dir directory ownership group to bareos
+      ansible.builtin.file:
+        path: "/etc/bareos/bareos-dir.d/"
+        state: directory
+        recurse: true
+        group: bareos
+      changed_when: false
+
 - name: Setup bareos DB monitoring
   when: bareos_setup_db_sensu
   block:

tasks/main.yml

@@ -17,12 +17,12 @@
 
 - name: Add BareOS apt-key
   apt_key:
-    url: "{{ bareos_repo }}/Release.key"
+    url: "{{ bareos_repo_key }}"
   when: ansible_os_family == 'Debian'
 
 - name: Ensure BareOS repo is present Debian
-  apt_repository:
-    repo: "deb {{ bareos_repo }}/ /"
+  ansible.builtin.apt_repository:
+    repo: "{{ bareos_repository }}"
   when: ansible_os_family == 'Debian'
 
 - name: Import GPG key

tasks/register_client.yml

@@ -103,7 +103,7 @@
   register: _bconsole_output
   failed_when: ('Error' in _bconsole_output.stdout) or ('Failed' in _bconsole_output.stdout) or ('not found' in _bconsole_output.stdout)
   when:
-    - item.autostart | default(true)
+    - item.autostart | default(false)
     - _bareos_backup_job.changed
 
 - name: Update client address if changed

templates/bareos-dir/job/BackupCatalog.conf.j2

@@ -7,9 +7,9 @@ Job {
   Schedule = "WeeklyCycleAfterBackup"
 
   # This creates an ASCII copy of the catalog
-  # Arguments to make_catalog_backup.pl are:
-  #  make_catalog_backup.pl <catalog-name>
-  RunBeforeJob = "/usr/lib/bareos/scripts/make_catalog_backup.pl MyCatalog"
+  # Arguments to make_catalog_backup are:
+  #  make_catalog_backup <catalog-name>
+  RunBeforeJob = "{{ bareos_catalog_backup_script }} MyCatalog"
 
   # This deletes the copy of the catalog
   RunAfterJob  = "/usr/lib/bareos/scripts/delete_catalog_backup"

templates/bareos-dir/jobdefs/jobdef.conf.j2

@@ -72,4 +72,13 @@ Keep the legacy defaults when the template is used to define JobDefs resources
 {% elif _resource_type == 'JobDefs' %}
   Cancel Queued Duplicates = yes
 {% endif %}
+{% if item.selection_type is defined %}
+  Selection Type = {{ item.selection_type }}
+{% endif %}
+{% if item.spool_data is defined %}
+  Spool Data = {{ item.spool_data }}
+{% endif %}
+{% if item.enabled is defined %}
+  Enabled = {{ item.enabled }}
+{% endif %}
 }