Skip to content

Commit 5dada98

Browse files
committed
silence linters
1 parent b3e5b2a commit 5dada98

12 files changed

+22
-17
lines changed

Dockerfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
#checkov:skip=CKV_DOCKER_2: no need for health check
2-
#checkov:skip=CKV_DOCKER_3: no need for special user
3-
#checkov:skip=CKV_DOCKER_7: I prefer the latest, like it, or not ;)
1+
# checkov:skip=CKV_DOCKER_2: no need for health check
2+
# checkov:skip=CKV_DOCKER_3: no need for special user
3+
# checkov:skip=CKV_DOCKER_7: I prefer the latest, like it, or not ;)
4+
# hadolint ignore=DL3007
45
FROM quay.io/almalinuxorg/8-init:latest
56
ENV container docker
67

7-
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in ; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done);
8+
WORKDIR /
9+
10+
RUN "(cd /lib/systemd/system/sysinit.target.wants/; for i in ; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done);"
811

912
RUN rm -rf /lib/systemd/system/multi-user.target.wants/ \
1013
&& rm -rf /etc/systemd/system/.wants/ \
@@ -14,6 +17,7 @@ RUN rm -rf /lib/systemd/system/multi-user.target.wants/ \
1417
&& rm -rf /lib/systemd/system/basic.target.wants/ \
1518
&& rm -f /lib/systemd/system/anaconda.target.wants/*
1619

20+
# hadolint ignore=DL3041
1721
RUN dnf -y install dnf-plugin-config-manager epel-release \
1822
&& dnf config-manager --set-enabled powertools \
1923
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 \
@@ -22,6 +26,7 @@ RUN dnf -y install dnf-plugin-config-manager epel-release \
2226
&& rpm --import https://mirror.apheleia-it.ch/repos/Kolab:/16/key.asc \
2327
&& rpm -Uvh https://mirror.apheleia-it.ch/repos/Kolab:/16/kolab-16-for-el8.rpm \
2428
&& dnf update --allowerasing -y \
25-
&& dnf -y install kolab
29+
&& dnf -y install kolab \
30+
&& dnf clean all
2631
VOLUME [ “/sys/fs/cgroup” ]
2732
CMD ["/usr/sbin/init"]

tasks/backups.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
- pdns
113113
- wg_vpn
114114
- name: Restore backups
115-
#checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition and the tags
115+
# checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition and the tags
116116
tags: restore
117117
when: mariadb_backup_path is defined or ldap_backup_path is defined or opendkim_backup_path is defined or opendmarc_backup_path is defined or vsftpd_backup_path is defined or ssl_backup_path is defined or kolab_backup_path is defined or imap_backup_path is defined or postfix_backup_path is defined or pdns_backup_path is defined or wg_vpn_backup_path is defined
118118
block:

tasks/convert_user_to_ldif.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
changed_when: passwd_mig_content.rc == 0
66
failed_when: (passwd_mig_content.rc != 0) and (passwd_mig_content.stderr | length > 0)
77
- name: "Migrate already existing user {{ user_data_item.name }}"
8-
#checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
8+
# checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
99
when: passwd_mig_content.changed
1010
block:
1111
- name: Set passwd line

tasks/httpd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- http
1414
- https
1515
- name: Set up SELinux rules
16-
#checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
16+
# checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
1717
when: getenforce.stdout != 'Disabled'
1818
block:
1919
- name: Set SELinux booleans

tasks/imapsync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Sync old IMAP account to the current mailbox
3-
#checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition and the tags
3+
# checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition and the tags
44
no_log: yes
55
when: current_user.old_imap_mail is defined
66
tags: imapsync

tasks/kolab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
state: restarted
433433

434434
- name: Enable domains
435-
#checkov:skip=CKV2_ANSIBLE_3: Block is used for the tag only
435+
# checkov:skip=CKV2_ANSIBLE_3: Block is used for the tag only
436436
tags: ldap
437437
block:
438438
# The editing domains in the Kolab API is not documented at the tome of this writing, so I go plain LDAP here

tasks/os.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
- name: Enable IPv6
2727
when: ansible_default_ipv6.address is not defined
28-
#checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition
28+
# checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition
2929
block:
3030
- name: Enable IPv6 via sysctl
3131
ansible.posix.sysctl:

tasks/packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
backup: yes
3535
create: yes
3636
- name: Set up Remi repository
37-
#checkov:skip=CKV2_ANSIBLE_4: The Remi repo doesn't provide GPG keys
37+
# checkov:skip=CKV2_ANSIBLE_4: The Remi repo doesn't provide GPG keys
3838
ansible.builtin.dnf:
3939
name: "https://rpms.remirepo.net/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
4040
disable_gpg_check: yes
@@ -483,7 +483,7 @@
483483
# remote_src: yes
484484
# backup: yes
485485
- name: Download as-is executables
486-
#checkov:skip=CKV2_ANSIBLE_2: HTTPS comes from a loop variable
486+
# checkov:skip=CKV2_ANSIBLE_2: HTTPS comes from a loop variable
487487
tags: imapsync
488488
ansible.builtin.get_url:
489489
url: "{{ item.url }}"

tasks/postfix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
backup: yes
185185
notify: Restart postfix
186186
- name: Set up HELO access whitelist
187-
#checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
187+
# checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
188188
when: helo_access is defined
189189
block:
190190
- name: Create HELO access whitelist

tasks/poweradmin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Get latest PowerAdmin version
3-
#checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
3+
# checkov:skip=CKV2_ANSIBLE_3: Block is used for the when condition only
44
tags:
55
- dyndns
66
- poweradmin

tasks/read_wireguard_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
path: "{{ wg_config_file }}"
55
register: wg_config_file_info
66
- name: Read existing WireGuard config into variable
7-
#checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition
7+
# checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition
88
when: wg_config_file_info.stat.exists
99
block:
1010
- name: Read WireGuard config file

tasks/webdav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
state: mounted
8181
fstype: fuse.bindfs
8282
- name: Set up SELinux rules for WebDAV
83-
#checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition and the tags
83+
# checkov:skip=CKV2_ANSIBLE_3: Block is only used for the when condition and the tags
8484
tags: wireguard
8585
when: getenforce.stdout != 'Disabled'
8686
block:

0 commit comments

Comments
 (0)