Hello community,
here is the log from the commit of package containers-systemd for
openSUSE:Factory checked in at 2020-12-21 12:35:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old)
and /work/SRC/openSUSE:Factory/.containers-systemd.new.5145 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd"
Mon Dec 21 12:35:24 2020 rev:19 rq:857743 version:0.0+git20201220.ed8a6b2
Changes:
--------
--- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes
2020-12-10 15:56:40.842772233 +0100
+++
/work/SRC/openSUSE:Factory/.containers-systemd.new.5145/containers-systemd.changes
2020-12-21 12:35:25.786968268 +0100
@@ -1,0 +2,26 @@
+Sun Dec 20 17:20:42 UTC 2020 - ku...@suse.com
+
+- Update to version 0.0+git20201220.ed8a6b2:
+ * Add default for FETCHMAILRC
+
+-------------------------------------------------------------------
+Sun Dec 20 15:35:17 UTC 2020 - ku...@suse.com
+
+- Update to version 0.0+git20201220.0fae7ba:
+ * Add service for fetchmail container
+
+-------------------------------------------------------------------
+Sun Dec 20 07:41:26 UTC 2020 - ku...@suse.com
+
+- Update to version 0.0+git20201220.69a11d7:
+ * Document spamassassin support
+ * Add support for a spamassassin container
+
+-------------------------------------------------------------------
+Thu Dec 17 14:50:53 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- LDAP_MAIL_READER_PASSWORD was renamed to LDAP_BIND_PASSWORD
+- Update to version 0.0+git20201217.a84253d:
+ * Allow to overwrite TLS key location
+
+-------------------------------------------------------------------
Old:
----
containers-systemd-0.0+git20201208.1b4413e.tar.xz
New:
----
containers-systemd-0.0+git20201220.ed8a6b2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containers-systemd.spec ++++++
--- /var/tmp/diff_new_pack.Kt6HKd/_old 2020-12-21 12:35:26.358969635 +0100
+++ /var/tmp/diff_new_pack.Kt6HKd/_new 2020-12-21 12:35:26.358969635 +0100
@@ -16,8 +16,8 @@
#
-%define containers bind dhcp-server dovecot haproxy mariadb minidlna nginx
openldap postfix squid
-%define container_services container-bind.service
container-dhcp-server.service container-dhcp6-server.service
container-dovecot.service container-haproxy.service container-mariadb.service
container-minidlna.service container-nginx.service container-openldap.service
container-postfix.service container-squid.service container-image-prune.service
container-image-prune.timer
+%define containers bind dhcp-server dovecot fetchmail haproxy mariadb minidlna
nginx openldap postfix spamassassin squid
+%define container_services container-bind.service
container-dhcp-server.service container-dhcp6-server.service
container-dovecot.service container-fetchmail.service container-haproxy.service
container-mariadb.service container-minidlna.service container-nginx.service
container-openldap.service container-postfix.service
container-spamassassin.service container-squid.service
container-image-prune.service container-image-prune.timer
%if %{undefined service_del_postun_without_restart}
%define service_del_postun_without_restart() \
@@ -26,7 +26,7 @@
%endif
Name: containers-systemd
-Version: 0.0+git20201208.1b4413e
+Version: 0.0+git20201220.ed8a6b2
Release: 0
Summary: Systemd service files and config files for openSUSE container
License: MIT
@@ -38,7 +38,8 @@
%description
This package contains the configuration files and systemd units
to run the openSUSE containers via podman managed by systemd.
-Currently supported are bind, dhcp-server, mariadb, nginx and squid.
+Currently supported are bind, dhcp-server, dovecot, fetchmail, haproxy,
+mariadb, minidlna, nginx, openldap, postfix, spamassassin and squid.
Additional, there is a timer to cleanup dangling container images.
%prep
@@ -70,7 +71,7 @@
touch %{buildroot}%{_sysconfdir}/openldap-secrets/$i
done
mkdir -p %{buildroot}%{_sysconfdir}/postfix-secrets
-for i in SMTP_PASSWORD LDAP_MAIL_READER_PASSWORD; do
+for i in SMTP_PASSWORD LDAP_BIND_PASSWORD; do
touch %{buildroot}%{_sysconfdir}/postfix-secrets/$i
done
@@ -104,6 +105,9 @@
%{_distconfdir}/default/container-dovecot
%{_sbindir}/rccontainer-dovecot
%ghost %dir /srv/dovecot
+%{_unitdir}/container-fetchmail.service
+%{_distconfdir}/default/container-fetchmail
+%{_sbindir}/rccontainer-fetchmail
%{_unitdir}/container-haproxy.service
%{_distconfdir}/default/container-haproxy
%{_sbindir}/rccontainer-haproxy
@@ -138,7 +142,10 @@
%ghost %dir /srv/postfix
%dir %attr(0700,root,root) %{_sysconfdir}/postfix-secrets
%config(noreplace) %attr(0600,root,root)
%{_sysconfdir}/postfix-secrets/SMTP_PASSWORD
-%config(noreplace) %attr(0600,root,root)
%{_sysconfdir}/postfix-secrets/LDAP_MAIL_READER_PASSWORD
+%config(noreplace) %attr(0600,root,root)
%{_sysconfdir}/postfix-secrets/LDAP_BIND_PASSWORD
+%{_unitdir}/container-spamassassin.service
+%{_distconfdir}/default/container-spamassassin
+%{_sbindir}/rccontainer-spamassassin
%{_unitdir}/container-squid.service
%{_distconfdir}/default/container-squid
%{_sbindir}/rccontainer-squid
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Kt6HKd/_old 2020-12-21 12:35:26.394969721 +0100
+++ /var/tmp/diff_new_pack.Kt6HKd/_new 2020-12-21 12:35:26.394969721 +0100
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/kubic-project/containers-systemd.git</param>
- <param
name="changesrevision">1b4413e91ca288a52f20d17bf5cb208126c796c0</param></service>
+ <param
name="changesrevision">ed8a6b2787e73999d535ceadf720f2d356217c35</param></service>
</servicedata>
\ No newline at end of file
++++++ containers-systemd-0.0+git20201208.1b4413e.tar.xz ->
containers-systemd-0.0+git20201220.ed8a6b2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/README.md
new/containers-systemd-0.0+git20201220.ed8a6b2/README.md
--- old/containers-systemd-0.0+git20201208.1b4413e/README.md 2020-12-08
16:34:40.000000000 +0100
+++ new/containers-systemd-0.0+git20201220.ed8a6b2/README.md 2020-12-20
18:20:16.000000000 +0100
@@ -8,12 +8,14 @@
* dhcp-server
* dhcp6-server
* dovecot
+ * fetchmail
* haproxy
* mariadb
* minidlna
* nginx
* openldap
* postfix
+ * spamassassin
* squid
Additional, there is the `container-image-prune.timer` to cleanup
@@ -34,6 +36,11 @@
* /usr/etc/default/container-dovecot contains generic settings
* /etc/default/container-dovecot is for the admin to overwrite them
+## fetchmail
+
+ * /usr/etc/default/container-fetchmail contains generic settings
+ * /etc/default/container-fetchmail is for the admin to overwrite them
+
## haproxy
* /usr/etc/default/container-haproxy contains generic settings
@@ -73,6 +80,11 @@
* /usr/etc/default/container-postfix contains generic settings
* /etc/default/container-postfix is for the admin to overwrite them
+## spamassassin
+
+ * /usr/etc/default/container-spamassassin contains generic settings
+ * /etc/default/container-spamassassin is for the admin to overwrite them
+
## squid
* /usr/etc/default/container-squid contains generic settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.service
new/containers-systemd-0.0+git20201220.ed8a6b2/container-dovecot.service
--- old/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.service
2020-12-08 16:34:40.000000000 +0100
+++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-dovecot.service
2020-12-20 18:20:16.000000000 +0100
@@ -12,7 +12,7 @@
ExecStartPre=-/usr/bin/podman stop dovecot
ExecStartPre=-/usr/bin/podman rm dovecot
ExecStartPre=-/usr/bin/podman pull ${DOVECOT_IMAGE_PATH}
-ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid
${PODMAN_EXTRA_ARGS} -v ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v
${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v
${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e
USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e
USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e
LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e
LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e
LDAP_USE_TLS=${LDAP_USE_TLS} -e ENABLE_IMAP=${ENABLE_IMAP} -e
ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e
ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name
dovecot ${DOVECOT_IMAGE_PATH}"
+ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid
${PODMAN_EXTRA_ARGS} -v ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v
${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v
${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e
USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e
USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e
LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e
LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e
LDAP_USE_TLS=${LDAP_USE_TLS} -e DOVECOT_TLS_CRT=${DOVECOT_TLS_CRT} -e
DOVECOT_TLS_KEY=${DOVECOT_TLS_KEY} -e DOVECOT_TLS_CA_CRT=${DOVECOT_TLS_CA_CRT}
-e DOVECOT_TLS_CA_KEY=${DOVECOT_TLS_CA_KEY} -e ENABLE_IMAP=${ENABLE_IMAP} -e
ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e
ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name
dovecot ${DOVECOT_IMAGE_PATH}"
ExecStop=/usr/bin/podman stop dovecot
KillMode=none
Type=forking
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.default
new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.default
--- old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.default
1970-01-01 01:00:00.000000000 +0100
+++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.default
2020-12-20 18:20:16.000000000 +0100
@@ -0,0 +1,17 @@
+# Variables of this file can be overwritten with
+# /etc/default/container-fetchmail
+
+# Name of the image path to pull the fetchmail image from
+FETCHMAIL_IMAGE_PATH=registry.opensuse.org/opensuse/fetchmail:latest
+
+# fetchmail configuration file
+FETCHMAILRC="/etc/fetchmailrc"
+
+# Intervall in which to poll for new mails
+POLLING_INTERVAL="600"
+
+# Comma seprated list of hosts to forward mail to
+SMTP_HOSTS=""
+
+# Extra arguments for podman to start the container
+PODMAN_EXTRA_ARGS=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.service
new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.service
--- old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.service
1970-01-01 01:00:00.000000000 +0100
+++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.service
2020-12-20 18:20:16.000000000 +0100
@@ -0,0 +1,21 @@
+[Unit]
+Description=openSUSE fetchmail container
+Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-fetchmail-image
+After=network-online.target local-fs.target firewalld.service
+Wants=network-online.target
+
+[Service]
+Restart=on-abnormal
+EnvironmentFile=/usr/etc/default/container-fetchmail
+EnvironmentFile=-/etc/default/container-fetchmail
+ExecStartPre=-/usr/bin/podman stop fetchmail
+ExecStartPre=-/usr/bin/podman rm fetchmail
+ExecStartPre=-/usr/bin/podman pull ${FETCHMAIL_IMAGE_PATH}
+ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm
${PODMAN_EXTRA_ARGS} -v ${FETCHMAILRC}:/etc/fetchmailrc:ro -e
POLLING_INTERVAL=${POLLING_INTERVAL} -e FETCHALL=${FETCHALL} -e
SILENT=${SILENT} -e SMTP_HOSTS=${SMTP_HOSTS} -e DEBUG=${DEBUG} -e TZ=${TZ}
--name fetchmail ${FETCHMAIL_IMAGE_PATH}"
+ExecStop=/usr/bin/podman stop fetchmail
+KillMode=none
+Type=forking
+PIDFile=/%t/%n-pid
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.default
new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.default
---
old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.default
1970-01-01 01:00:00.000000000 +0100
+++
new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.default
2020-12-20 18:20:16.000000000 +0100
@@ -0,0 +1,8 @@
+# Variables of this file can be overwritten with
+# /etc/default/container-spamassassin
+
+# Name of the image path to pull the spamassassin image from
+SPAMASSASSIN_IMAGE_PATH=registry.opensuse.org/opensuse/spamassassin:latest
+
+# Extra arguments for podman to start the container
+PODMAN_EXTRA_ARGS=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.service
new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.service
---
old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.service
1970-01-01 01:00:00.000000000 +0100
+++
new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.service
2020-12-20 18:20:16.000000000 +0100
@@ -0,0 +1,21 @@
+[Unit]
+Description=openSUSE SpamAssassin container
+Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-spamassassin-image
+After=network-online.target local-fs.target firewalld.service
+Wants=network-online.target
+
+[Service]
+Restart=on-abnormal
+EnvironmentFile=/usr/etc/default/container-spamassassin
+EnvironmentFile=-/etc/default/container-spamassassin
+ExecStartPre=-/usr/bin/podman stop spamassassin
+ExecStartPre=-/usr/bin/podman rm spamassassin
+ExecStartPre=-/usr/bin/podman pull ${SPAMASSASSIN_IMAGE_PATH}
+ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm
${PODMAN_EXTRA_ARGS} -p 783:783 -e DEBUG=${DEBUG} -e TZ=${TZ} --name
spamassassin ${SPAMASSASSIN_IMAGE_PATH}"
+ExecStop=/usr/bin/podman stop spamassassin
+KillMode=none
+Type=forking
+PIDFile=/%t/%n-pid
+
+[Install]
+WantedBy=multi-user.target
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
