From 34bdf9564f58310549a7442f478f6e0900a311e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Thu, 7 Mar 2024 16:44:10 +0100
Subject: [PATCH] style: satisfy linter
---
molecule/resources/playbooks/prepare.yml | 112 +++++++++++------------
tasks/install_subapp.yml | 1 -
2 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/molecule/resources/playbooks/prepare.yml b/molecule/resources/playbooks/prepare.yml
index 0590c79..07c723e 100644
--- a/molecule/resources/playbooks/prepare.yml
+++ b/molecule/resources/playbooks/prepare.yml
@@ -5,66 +5,66 @@
- name: configure additional package repositories for Debian
when: ansible_os_family == "Debian"
block:
- - name: install GPG
- ansible.builtin.apt:
- name: "gnupg"
- state: latest
- update_cache: true
- become: true
- - name: modify package repo config
- ansible.builtin.deb822_repository:
- architectures: "amd64"
- components: "{{ item.components | default('main') }}"
- enabled: "{{ item.enabled | default(true) }}"
- name: "{{ item.name }}"
- pdiffs: true
- signed_by: "{{ item.signed_by }}"
- suites: "{{ item.suites | default(ansible_lsb.codename) }}"
- uris: "{{ item.uris }}"
- loop:
- # PC @steidl with local Debian repo for SubAp tests
- - name: "bdv141"
- signed_by: "http://bdv141.slub-dresden.de/deb-repository/pub.gpg.key"
- suites: "lza-testing"
- uris: "http://bdv141.slub-dresden.de/deb-repository"
- # on-prem Debian Repo
- - name: "slub"
- signed_by: "https://sdvdebianrepo.slub-dresden.de/deb-repository/pub.gpg.key"
- uris: "https://sdvdebianrepo.slub-dresden.de/deb-repository"
- # add non-free repos to be able to install libmath-random-perl from official Debian public repo
- - name: "debian"
- components: ["main", "non-free"]
- signed_by: "/usr/share/keyrings/debian-archive-keyring.gpg"
- suites: ["{{ ansible_lsb.codename }}", "{{ ansible_lsb.codename }}-updates"]
- uris: "http://deb.debian.org/debian"
- notify: update package cache
- become: true
+ - name: install GPG
+ ansible.builtin.apt:
+ name: "gnupg"
+ state: latest
+ update_cache: true
+ become: true
+ - name: modify package repo config
+ ansible.builtin.deb822_repository:
+ architectures: "amd64"
+ components: "{{ item.components | default('main') }}"
+ enabled: "{{ item.enabled | default(true) }}"
+ name: "{{ item.name }}"
+ pdiffs: true
+ signed_by: "{{ item.signed_by }}"
+ suites: "{{ item.suites | default(ansible_lsb.codename) }}"
+ uris: "{{ item.uris }}"
+ loop:
+ # PC @steidl with local Debian repo for SubAp tests
+ - name: "bdv141"
+ signed_by: "http://bdv141.slub-dresden.de/deb-repository/pub.gpg.key"
+ suites: "lza-testing"
+ uris: "http://bdv141.slub-dresden.de/deb-repository"
+ # on-prem Debian Repo
+ - name: "slub"
+ signed_by: "https://sdvdebianrepo.slub-dresden.de/deb-repository/pub.gpg.key"
+ uris: "https://sdvdebianrepo.slub-dresden.de/deb-repository"
+ # add non-free repos to be able to install libmath-random-perl from official Debian public repo
+ - name: "debian"
+ components: ["main", "non-free"]
+ signed_by: "/usr/share/keyrings/debian-archive-keyring.gpg"
+ suites: ["{{ ansible_lsb.codename }}", "{{ ansible_lsb.codename }}-updates"]
+ uris: "http://deb.debian.org/debian"
+ notify: update package cache
+ become: true
- name: configure additional package repositories for RedHat
when: ansible_os_family == "RedHat"
block:
- - name: add custom repositories
- ansible.builtin.yum_repository:
- name: "{{ item.name }}"
- description: "{{ item.description }}"
- baseurl: "{{ item.baseurl }}"
- gpgcheck: "{{ item.gpgcheck | default('true') }}"
- gpgkey: "{{ item.gpgkey | default(omit) }}"
- loop:
- - name: "epel"
- description: EPEL YUM repo
- baseurl: "https://download.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/x86_64/"
- gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"
- - name: "slub"
- description: SLUB YUM repo
- baseurl: "https://sdvrhelrepo.slub-dresden.de/"
- gpgcheck: "false"
- notify: update package cache
- - name: remove legacy repo configuration to avoid double configuration for SLUB repo
- ansible.builtin.file:
- path: "/etc/yum.repos.d/SLUB.repo"
- state: absent
- notify: update package cache
+ - name: add custom repositories
+ ansible.builtin.yum_repository:
+ name: "{{ item.name }}"
+ description: "{{ item.description }}"
+ baseurl: "{{ item.baseurl }}"
+ gpgcheck: "{{ item.gpgcheck | default('true') }}"
+ gpgkey: "{{ item.gpgkey | default(omit) }}"
+ loop:
+ - name: "epel"
+ description: EPEL YUM repo
+ baseurl: "https://download.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/x86_64/"
+ gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"
+ - name: "slub"
+ description: SLUB YUM repo
+ baseurl: "https://sdvrhelrepo.slub-dresden.de/"
+ gpgcheck: "false"
+ notify: update package cache
+ - name: remove legacy repo configuration to avoid double configuration for SLUB repo
+ ansible.builtin.file:
+ path: "/etc/yum.repos.d/SLUB.repo"
+ state: absent
+ notify: update package cache
# Ansible roles can install a multitude of firewall rules, some of which
# will lock us out of our Molecule test VM if we don't take precautions.
diff --git a/tasks/install_subapp.yml b/tasks/install_subapp.yml
index 89a933e..84a2b05 100644
--- a/tasks/install_subapp.yml
+++ b/tasks/install_subapp.yml
@@ -41,7 +41,6 @@
allow_unauthenticated: "true"
-
##### BEGIN #####
# Previously, our systemd unit files were installed below "/etc/systemd/user/"
--
GitLab