Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderbazhenoff committed Mar 30, 2024
1 parent b24ffe0 commit a22934a
Show file tree
Hide file tree
Showing 19 changed files with 130 additions and 154 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- markdownlint-disable MD033 MD001 MD041 -->
An ansible collection with linux-related roles to perform various setups.


## Project content.

#### Roles:
Expand All @@ -26,7 +26,7 @@ apps and platform autodiscovery on

#### Install from ansible galaxy:

1. Set-up collection from ansible galaxy:
1. Set-up collection from ansible galaxy:
```bash
ansible-galaxy collection install alexanderbazhenoff.linux
```
Expand Down
2 changes: 1 addition & 1 deletion lychee.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# More info: https://lychee.cli.rs/usage/config/
verbose = "info"
verbose = "warn"
cache = true
require_https = false
include_verbatim = true
Expand Down
10 changes: 5 additions & 5 deletions roles/bareos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ tuning to speed up).
webui_tls_enable: false
```
You can set `webui-admin`, `operator`, `webui-limited` or `webui-readonly` access level (webui_profile)
You can set `webui-admin`, `operator`, `webui-limited` or `webui-readonly` access level (webui_profile)
[your profile needs](https://docs.bareos.org/IntroductionAndTutorial/BareosWebui.html#access-control-configuration).
For revoke access replace the next line:

Expand Down Expand Up @@ -351,7 +351,7 @@ how to apply bareos-dir, bareos-sd, bareos-fd and Bareos Web UI (by restart Apac
install.
- **bareos_release** *[Default: 21]*: [Bareos release version](https://download.bareos.org/), e.g.:
'current', 'next' or 'experimental/<postfix>'. Affects only for Debian and Redhat Linux distribution families.
- **bareos_url** *[Default: https://download.bareos.org/]*: Bareos repository URL prefix to download from
- **bareos_url** *[Default: `https://download.bareos.org/`]*: Bareos repository URL prefix to download from
(for example, if you with to use local or another repo).
- **override_ansible_distribution_major_version** *[Default: None]*: Override ansible linux distribution major version.
Useful when specified Bareos version repo is not available for your Linux distribution version, but beware package
Expand Down Expand Up @@ -422,13 +422,13 @@ version.

Another variables:

- **postgresql_url** *[Default: https://download.postgresql.org/pub/]*: Download PostgreSQL repository URL prefix.
- **postgresql_debian_key_url** [Default: https://www.postgresql.org/media/keys/ACCC4CF8.asc]: PostgreSQL asc key URL
- **postgresql_url** *[Default: `https://download.postgresql.org/pub/`]*: Download PostgreSQL repository URL prefix.
- **postgresql_debian_key_url** [Default: `https://www.postgresql.org/media/keys/ACCC4CF8.asc`]: PostgreSQL asc key URL
for Debian.
- **postgresql_debian_keys_dir** *[Default: /etc/apt/keyrings]*: Debian apt keys destination path.
- **postgresql_debian_key_destination** *[Default: `"{{ postgresql_debian_keys_dir }}/pgdg.asc"`]*: Debian apt keys full
path.
- **postgresql_debian_apt_repo_url_prefix** *[Default: http://apt.postgresql.org/pub/repos/apt/]*: Debian PostgreSQL
- **postgresql_debian_apt_repo_url_prefix** *[Default: `http://apt.postgresql.org/pub/repos/apt/`]*: Debian PostgreSQL
URL prefix for apt repo.
- **postgresql_debian_repo** *[Default:*

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ARG image_platform
ARG image_tag
FROM ${image_platform}:${image_tag}

# hadolint ignore=SC3014,SC2154
RUN apk update; \
apk add --no-cache sudo bash dbus python3 gnupg ca-certificates openrc; \
apk --no-cache add sudo bash dbus python3 gnupg ca-certificates openrc; \
mkdir -p /run/openrc; \
touch /run/openrc/softlevel; \
echo 'rc_provide="loopback net"' >> /etc/rc.conf; \
sed -i -e 's/#rc_sys=""/rc_sys="lxc"/g' -e 's/^#\(rc_logger="YES"\)$/\1/' /etc/rc.conf; \
sed -i '/tty/d' /etc/inittab; \
sed -i 's/hostname $opts/# hostname $opts/g' /etc/init.d/hostname; \
sed -i 's/mount -t tmpfs/# mount -t tmpfs/g' /lib/rc/sh/init.sh
sed -i "/tty/d" /etc/inittab; \
sed -i "s/hostname $opts/# hostname $opts/g" /etc/init.d/hostname; \
sed -i "s/mount -t tmpfs/# mount -t tmpfs/g" /lib/rc/sh/init.sh

VOLUME ["/sys/fs/cgroup"]
ENTRYPOINT ["/sbin/init"]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ ARG image_platform
ARG image_tag
FROM ${image_platform}:${image_tag}


ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
Expand Down
8 changes: 4 additions & 4 deletions roles/bareos/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ platforms:

- name: debian12-instance
image: jrei/systemd-debian:12
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-debian
image_tag: 12
Expand All @@ -32,7 +32,7 @@ platforms:

- name: ubuntu2004-instance
image: jrei/systemd-ubuntu:20.04
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-ubuntu
image_tag: 20.04
Expand All @@ -53,7 +53,7 @@ platforms:

- name: ubuntu2204-instance
image: jrei/systemd-ubuntu:22.04
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-ubuntu
image_tag: 22.04
Expand All @@ -74,7 +74,7 @@ platforms:

- name: oraclelinux9-instance
image: oraclelinux:9
dockerfile: dockerfile_redhat.j2
dockerfile: Dockerfile_redhat
buildargs:
image_platform: oraclelinux
image_tag: 9
Expand Down
16 changes: 16 additions & 0 deletions roles/lxcfs/molecule/default/Dockerfile_debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ARG image_platform
ARG image_tag
FROM ${image_platform}:${image_tag}


ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update; \
apt-get install -y python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release \
--no-install-recommends; \
apt-get install -y software-properties-common dialog dbus wget procps --no-install-recommends; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*

VOLUME ["/sys/fs/cgroup"]
CMD ["/lib/systemd/systemd"]
6 changes: 3 additions & 3 deletions roles/lxcfs/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ platforms:

- name: debian11-instance
image: jrei/systemd-debian:11
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-debian
image_tag: 11
Expand All @@ -29,7 +29,7 @@ platforms:

- name: ubuntu2004-instance
image: jrei/systemd-ubuntu:20.04
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-ubuntu
image_tag: 20.04
Expand All @@ -47,7 +47,7 @@ platforms:

- name: ubuntu2204-instance
image: jrei/systemd-ubuntu:22.04
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-ubuntu
image_tag: 22.04
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ARG image_platform
ARG image_tag
FROM ${image_platform}:${image_tag}

# hadolint ignore=SC3014,SC2154
RUN apk update; \
apk add --no-cache sudo bash dbus python3 gnupg ca-certificates openrc; \
apk --no-cache add sudo bash dbus python3 gnupg ca-certificates openrc; \
mkdir -p /run/openrc; \
touch /run/openrc/softlevel; \
echo 'rc_provide="loopback net"' >> /etc/rc.conf; \
sed -i -e 's/#rc_sys=""/rc_sys="lxc"/g' -e 's/^#\(rc_logger="YES"\)$/\1/' /etc/rc.conf; \
sed -i '/tty/d' /etc/inittab; \
sed -i 's/hostname $opts/# hostname $opts/g' /etc/init.d/hostname; \
sed -i 's/mount -t tmpfs/# mount -t tmpfs/g' /lib/rc/sh/init.sh
sed -i "/tty/d" /etc/inittab; \
sed -i "s/hostname $opts/# hostname $opts/g" /etc/init.d/hostname; \
sed -i "s/mount -t tmpfs/# mount -t tmpfs/g" /lib/rc/sh/init.sh

VOLUME ["/sys/fs/cgroup"]
ENTRYPOINT ["/sbin/init"]
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ FROM ${image_platform}:${image_tag}
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update; \
apt-get install -y python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release; \
apt-get install -y software-properties-common apt-utils dialog dbus wget procps; \
apt-get install -y python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release \
--no-install-recommends; \
apt-get install -y software-properties-common dialog dbus wget --no-install-recommends; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*

Expand Down
14 changes: 0 additions & 14 deletions roles/postgresql/molecule/default/dockerfile_debian.j2

This file was deleted.

14 changes: 7 additions & 7 deletions roles/postgresql/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ platforms:

- name: debian11-instance
image: jrei/systemd-debian:11
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-debian
image_tag: 11
Expand All @@ -29,7 +29,7 @@ platforms:

- name: debian12-instance
image: jrei/systemd-debian:12
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-debian
image_tag: 12
Expand All @@ -47,7 +47,7 @@ platforms:

- name: ubuntu2004-instance
image: jrei/systemd-ubuntu:20.04
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-ubuntu
image_tag: 20.04
Expand All @@ -65,7 +65,7 @@ platforms:

- name: ubuntu2204-instance
image: jrei/systemd-ubuntu:22.04
dockerfile: dockerfile_debian.j2
dockerfile: Dockerfile_debian
buildargs:
image_platform: jrei/systemd-ubuntu
image_tag: 22.04
Expand All @@ -83,7 +83,7 @@ platforms:

- name: oraclelinux8-instance
image: oraclelinux:8
dockerfile: dockerfile_redhat.j2
dockerfile: Dockerfile_redhat
buildargs:
image_platform: oraclelinux
image_tag: 8
Expand All @@ -100,7 +100,7 @@ platforms:

- name: oraclelinux9-instance
image: oraclelinux:9
dockerfile: dockerfile_redhat.j2
dockerfile: Dockerfile_redhat
buildargs:
image_platform: oraclelinux
image_tag: 9
Expand All @@ -117,7 +117,7 @@ platforms:

- name: alpine-latest-instance
image: alpine:latest
dockerfile: dockerfile_alpine.j2
dockerfile: Dockerfile_alpine
buildargs:
image_platform: alpine
image_tag: latest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ARG image_platform
ARG image_tag
FROM ${image_platform}:${image_tag}

# hadolint ignore=SC3014,SC2154
RUN apk update; \
apk add --no-cache sudo bash dbus python3 gnupg ca-certificates openrc coreutils iputils pcre2 tzdata; \
apk --no-cache add --no-cache sudo bash dbus python3 gnupg ca-certificates openrc coreutils iputils pcre2 tzdata; \
mkdir -p /run/openrc; \
touch /run/openrc/softlevel; \
echo 'rc_provide="loopback net"' >> /etc/rc.conf; \
sed -i -e 's/#rc_sys=""/rc_sys="lxc"/g' -e 's/^#\(rc_logger="YES"\)$/\1/' /etc/rc.conf; \
sed -i '/tty/d' /etc/inittab; \
sed -i 's/hostname $opts/# hostname $opts/g' /etc/init.d/hostname; \
sed -i 's/mount -t tmpfs/# mount -t tmpfs/g' /lib/rc/sh/init.sh
sed -i "/tty/d" /etc/inittab; \
sed -i "s/hostname $opts/# hostname $opts/g" /etc/init.d/hostname; \
sed -i "s/mount -t tmpfs/# mount -t tmpfs/g" /lib/rc/sh/init.sh

VOLUME ["/sys/fs/cgroup"]
ENTRYPOINT ["/sbin/init"]
26 changes: 0 additions & 26 deletions roles/zabbix_agent/molecule/default/dockerfile_arch.j2

This file was deleted.

Loading

0 comments on commit a22934a

Please sign in to comment.