Hello community, here is the log from the commit of package containers-systemd for openSUSE:Factory checked in at 2020-12-10 15:56:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd" Thu Dec 10 15:56:38 2020 rev:18 rq:854067 version:0.0+git20201208.1b4413e Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2020-11-15 15:24:15.863314850 +0100 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.2328/containers-systemd.changes 2020-12-10 15:56:40.842772233 +0100 @@ -1,0 +2,9 @@ +Tue Dec 08 15:35:19 UTC 2020 - ku...@suse.com + +- Update to version 0.0+git20201208.1b4413e: + * Add support for dovecot + * Fix description + * Add support for minidlna container + * Add LMTP variable + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20201113.5e435e8.tar.xz New: ---- containers-systemd-0.0+git20201208.1b4413e.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.deaQdi/_old 2020-12-10 15:56:41.910773237 +0100 +++ /var/tmp/diff_new_pack.deaQdi/_new 2020-12-10 15:56:41.914773241 +0100 @@ -16,8 +16,8 @@ # -%define containers bind dhcp-server haproxy mariadb nginx openldap postfix squid -%define container_services container-bind.service container-dhcp-server.service container-dhcp6-server.service container-haproxy.service container-mariadb.service container-nginx.service container-openldap.service container-postfix.service container-squid.service container-image-prune.timer +%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 %if %{undefined service_del_postun_without_restart} %define service_del_postun_without_restart() \ @@ -26,7 +26,7 @@ %endif Name: containers-systemd -Version: 0.0+git20201113.5e435e8 +Version: 0.0+git20201208.1b4413e Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT @@ -100,6 +100,10 @@ %{_sbindir}/rccontainer-dhcp-server %{_sbindir}/rccontainer-dhcp6-server %ghost %dir /srv/dhcp-server +%{_unitdir}/container-dovecot.service +%{_distconfdir}/default/container-dovecot +%{_sbindir}/rccontainer-dovecot +%ghost %dir /srv/dovecot %{_unitdir}/container-haproxy.service %{_distconfdir}/default/container-haproxy %{_sbindir}/rccontainer-haproxy @@ -114,6 +118,9 @@ %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/mariadb-secrets/MYSQL_DATABASE %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/mariadb-secrets/MYSQL_USER %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/mariadb-secrets/MYSQL_PASSWORD +%{_unitdir}/container-minidlna.service +%{_distconfdir}/default/container-minidlna +%{_sbindir}/rccontainer-minidlna %{_unitdir}/container-nginx.service %{_distconfdir}/default/container-nginx %{_sbindir}/rccontainer-nginx ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.deaQdi/_old 2020-12-10 15:56:41.954773279 +0100 +++ /var/tmp/diff_new_pack.deaQdi/_new 2020-12-10 15:56:41.958773283 +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">5e435e86d7c489b21b252595e9a0676f8666e830</param></service> + <param name="changesrevision">1b4413e91ca288a52f20d17bf5cb208126c796c0</param></service> </servicedata> \ No newline at end of file ++++++ containers-systemd-0.0+git20201113.5e435e8.tar.xz -> containers-systemd-0.0+git20201208.1b4413e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201113.5e435e8/README.md new/containers-systemd-0.0+git20201208.1b4413e/README.md --- old/containers-systemd-0.0+git20201113.5e435e8/README.md 2020-11-13 15:10:23.000000000 +0100 +++ new/containers-systemd-0.0+git20201208.1b4413e/README.md 2020-12-08 16:34:40.000000000 +0100 @@ -7,10 +7,13 @@ * bind * dhcp-server * dhcp6-server + * dovecot * haproxy * mariadb + * minidlna * nginx * openldap + * postfix * squid Additional, there is the `container-image-prune.timer` to cleanup @@ -26,6 +29,11 @@ * /usr/etc/default/container-dhcp contains generic settings for the dhcpd4 and dhcpd6 daemons. It is required to set DHCPD_INTERFACES. During the first start, example ${CONFIG_DIR}/dhcpd.conf or ${CONFIG_DIR}/dhcpd6.conf are created. * /etc/default/container-dhcp is for the admin to overwrite them +## dovecot + + * /usr/etc/default/container-dovecot contains generic settings + * /etc/default/container-dovecot is for the admin to overwrite them + ## haproxy * /usr/etc/default/container-haproxy contains generic settings @@ -42,6 +50,11 @@ * ${SECRETS_DIR}/MYSQL_USER * ${SECRETS_DIR}/MYSQL_PASSWORD +## minidlna + + * /usr/etc/default/container-minidlna contains generic settings + * /etc/default/container-minidlna is for the admin to overwrite them + ## nginx * /usr/etc/default/container-nginx contains generic settings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201113.5e435e8/container-dovecot.default new/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.default --- old/containers-systemd-0.0+git20201113.5e435e8/container-dovecot.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.default 2020-12-08 16:34:40.000000000 +0100 @@ -0,0 +1,47 @@ +# Variables of this file can be overwritten with +# /etc/default/container-dovecot + +# Name of the image path to pull the dovecot image from +DOVECOT_IMAGE_PATH=registry.opensuse.org/opensuse/dovecot:latest + +# Name of the path where the mails will be stored +DOVECOT_VMAIL_DIR=/srv/dovecot/vmail + +# Directory, where certificates can be found or self signed +# autogenerated certificates will be stored +DOVECOT_CERTS_DIR="/srv/dovecot/certs" + +# Directory where additional system wide certs are stored +EXTRA_PKI_DIR=/etc/pki + +# Name of the path where the files with the passwords for +# DOVECOT_ADMIN_PASSWORD and LDAP_BIND_PASSWORD can be found. +# The file names needs to be the ones of the variable names and +# should not be readable for anybody else. It will be mounted to +# "/etc/dovecot-secrets" inside the container. +SECRETS_DIR="/etc/dovecot-secrets" + +# Ports which needs to be exported +DOVECOT_PORTS="-p 24:24 -p 110:110 -p 143:143 -p 993:993 -p 995:995 -p 4190:4190" + +# Enable usage of vmail user as owner of all files +USE_VMAIL_USER=0 + +# Enable LMTP. As this opens the port to the network, this +# should be protected by a firewall rule. +ENABLE_LMTP=0 + +# Allow to upload sieve scripts by users. This opens ports +# to the network, which should be protected by a firewall rule. +ENABLE_MANAGESIEVE=0 + +# Use LDAP for user accounts +USE_LDAP=0 +LDAP_HOSTS=ldap.example.org +LDAP_BASE_DN="ou=mail,dc=example,dc=org" +LDAP_BIND_DN="cn=mailAccountReader,ou=Manager,dc=example,dc=org" +LDAP_BIND_PASSWORD_FILE="/etc/dovecot-secrets/LDAP_BIND_PASSWORD" + +# Extra arguments for podman to start the container +# This can e.g. be the hostname: "--hostname <host.domain>" +PODMAN_EXTRA_ARGS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201113.5e435e8/container-dovecot.service new/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.service --- old/containers-systemd-0.0+git20201113.5e435e8/container-dovecot.service 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.service 2020-12-08 16:34:40.000000000 +0100 @@ -0,0 +1,22 @@ +[Unit] +Description=openSUSE dovecot container +Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-dovecot-image +After=network-online.target local-fs.target firewalld.service +Wants=network-online.target + +[Service] +Restart=on-abnormal +EnvironmentFile=/usr/etc/default/container-dovecot +EnvironmentFile=-/etc/default/container-dovecot +ExecStartPre=-/usr/bin/mkdir -p ${DOVECOT_CERTS_DIR} ${DOVECOT_VMAIL_DIR} ${EXTRA_PKI_DIR} +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}" +ExecStop=/usr/bin/podman stop dovecot +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+git20201113.5e435e8/container-minidlna.default new/containers-systemd-0.0+git20201208.1b4413e/container-minidlna.default --- old/containers-systemd-0.0+git20201113.5e435e8/container-minidlna.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201208.1b4413e/container-minidlna.default 2020-12-08 16:34:40.000000000 +0100 @@ -0,0 +1,27 @@ +# Variables of this file can be overwritten with +# /etc/default/container-minidlna + +# Name of the image path to pull the minidlna image from +MINIDLNA_IMAGE_PATH=registry.opensuse.org/opensuse/minidlna:latest + +# Name of the path where the multimedia files can be found +# Will be mounted into the container as /media +MEDIA_DIR="/srv/minidlna" + +# Network or ports which needs to be exported +MINIDLNA_NET="--net=host" + +# Environment variables to configure minidlna +# Any configuration directive of minidlna can be prefixed with MINIDLNA_ +# e.g. +# MINIDLNA_MEDIA_DIR=/media +# MINIDLNA_MEDIA_DIR_1=A,/media/audio +# MINIDLNA_MEDIA_DIR_2=V,/media/video +# MINIDLNA_FRIENDLY_NAME="My DNLA Server" +MINIDLNA_ENV="-e MINIDLNA_MEDIA_DIR=/media" + +# Additional arguments for minidlna, e.g. "-d" for debugging +MINIDLNA_OPTS="" + +# 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+git20201113.5e435e8/container-minidlna.service new/containers-systemd-0.0+git20201208.1b4413e/container-minidlna.service --- old/containers-systemd-0.0+git20201113.5e435e8/container-minidlna.service 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201208.1b4413e/container-minidlna.service 2020-12-08 16:34:40.000000000 +0100 @@ -0,0 +1,22 @@ +[Unit] +Description=openSUSE MiniDLNA container +Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-minidlna-image +After=network-online.target local-fs.target firewalld.service +Wants=network-online.target + +[Service] +Restart=on-abnormal +EnvironmentFile=/usr/etc/default/container-minidlna +EnvironmentFile=-/etc/default/container-minidlna +ExecStartPre=-/usr/bin/mkdir -p ${MEDIA_DIR} +ExecStartPre=-/usr/bin/podman stop minidlna +ExecStartPre=-/usr/bin/podman rm minidlna +ExecStartPre=-/usr/bin/podman pull ${MINIDLNA_IMAGE_PATH} +ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} ${MINIDLNA_NET} -v ${MEDIA_DIR}:/media:Z ${MINIDLNA_ENV} -e DEBUG=${DEBUG} --name minidlna ${MINIDLNA_IMAGE_PATH} ${MINIDLNA_OPTS}" +ExecStop=/usr/bin/podman stop minidlna +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+git20201113.5e435e8/container-postfix.service new/containers-systemd-0.0+git20201208.1b4413e/container-postfix.service --- old/containers-systemd-0.0+git20201113.5e435e8/container-postfix.service 2020-11-13 15:10:23.000000000 +0100 +++ new/containers-systemd-0.0+git20201208.1b4413e/container-postfix.service 2020-12-08 16:34:40.000000000 +0100 @@ -12,7 +12,7 @@ ExecStartPre=-/usr/bin/podman stop postfix ExecStartPre=-/usr/bin/podman rm postfix ExecStartPre=-/usr/bin/podman pull ${POSTFIX_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${POSTFIX_SPOOL_DIR}:/var/spool/postfix:Z -v ${POSTFIX_VMAIL_DIR}:/var/spool/vmail:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/postfix-secrets:Z ${POSTFIX_PORTS} -e SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_USERNAME=${SMTP_USERNAME} -e SMTP_PASSWORD_FILE=${SMTP_PASSWORD_FILE} -e SMTP_NETWORKS=${SMTP_NETWORKS} -e MASQUERADE_DOMAINS=${MASQUERADE_DOMAINS} -e MYDESTINATION=${MYDESTINATION} -e VIRTUAL_MBOX=${VIRTUAL_MBOX} -e VMAIL_UID=${VMAIL_UID} -e VIRTUAL_DOMAINS=${VIRTUAL_DOMAINS} -e VIRTUAL_USERS=${VIRTUAL_USERS} -e USE_LDAP=${USE_LDAP} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_SERVER_URL=${LDAP_SERVER_URL} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e TZ=${TZ} -e DEBUG=${DEBUG} --name postfix ${POSTFIX_IMAGE_PATH}" +ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${POSTFIX_SPOOL_DIR}:/var/spool/postfix:Z -v ${POSTFIX_VMAIL_DIR}:/var/spool/vmail:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/postfix-secrets:Z ${POSTFIX_PORTS} -e SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_USERNAME=${SMTP_USERNAME} -e SMTP_PASSWORD_FILE=${SMTP_PASSWORD_FILE} -e SMTP_NETWORKS=${SMTP_NETWORKS} -e MASQUERADE_DOMAINS=${MASQUERADE_DOMAINS} -e MYDESTINATION=${MYDESTINATION} -e LMTP=${LMTP} -e VIRTUAL_MBOX=${VIRTUAL_MBOX} -e VMAIL_UID=${VMAIL_UID} -e VIRTUAL_DOMAINS=${VIRTUAL_DOMAINS} -e VIRTUAL_USERS=${VIRTUAL_USERS} -e USE_LDAP=${USE_LDAP} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_SERVER_URL=${LDAP_SERVER_URL} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e TZ=${TZ} -e DEBUG=${DEBUG} --name postfix ${POSTFIX_IMAGE_PATH}" ExecStop=/usr/bin/podman stop postfix KillMode=none Type=forking ++++++ containers-systemd.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.deaQdi/_old 2020-12-10 15:56:42.046773366 +0100 +++ /var/tmp/diff_new_pack.deaQdi/_new 2020-12-10 15:56:42.050773370 +0100 @@ -4,4 +4,4 @@ addFilter("zero-length /etc/postfix-secrets/.*") # We don't install /sbin/service to build the package addFilter("dangling-symlink /usr/sbin/rccontainer-.*") - +addFilter("suse-missing-rclink container-image-prune") _______________________________________________ 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