Hello community, here is the log from the commit of package containers-systemd for openSUSE:Factory checked in at 2020-11-15 15:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd" Sun Nov 15 15:22:23 2020 rev:17 rq:848355 version:0.0+git20201113.5e435e8 Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2020-10-27 18:58:41.578732241 +0100 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.24930/containers-systemd.changes 2020-11-15 15:24:15.863314850 +0100 @@ -1,0 +2,9 @@ +Fri Nov 13 14:11:01 UTC 2020 - [email protected] + +- Update to version 0.0+git20201113.5e435e8: + * Make more options configureable + * Make list of ports to export configureable + * Only restart containers when the process fails abnormally + * Add LDAP_BIND_DN, make password files configureable + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20201027.f1d33d8.tar.xz New: ---- containers-systemd-0.0+git20201113.5e435e8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.ngKzrT/_old 2020-11-15 15:24:16.891315950 +0100 +++ /var/tmp/diff_new_pack.ngKzrT/_new 2020-11-15 15:24:16.891315950 +0100 @@ -26,7 +26,7 @@ %endif Name: containers-systemd -Version: 0.0+git20201027.f1d33d8 +Version: 0.0+git20201113.5e435e8 Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ngKzrT/_old 2020-11-15 15:24:16.935315998 +0100 +++ /var/tmp/diff_new_pack.ngKzrT/_new 2020-11-15 15:24:16.935315998 +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">f1d33d81a31267171e38ff6951d0a7f90f3731bf</param></service> + <param name="changesrevision">5e435e86d7c489b21b252595e9a0676f8666e830</param></service> </servicedata> \ No newline at end of file ++++++ containers-systemd-0.0+git20201027.f1d33d8.tar.xz -> containers-systemd-0.0+git20201113.5e435e8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-bind.service new/containers-systemd-0.0+git20201113.5e435e8/container-bind.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-bind.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-bind.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-bind EnvironmentFile=-/etc/default/container-bind ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-dhcp-server.service new/containers-systemd-0.0+git20201113.5e435e8/container-dhcp-server.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-dhcp-server.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-dhcp-server.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-dhcp-server EnvironmentFile=-/etc/default/container-dhcp-server ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-dhcp6-server.service new/containers-systemd-0.0+git20201113.5e435e8/container-dhcp6-server.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-dhcp6-server.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-dhcp6-server.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-dhcp-server EnvironmentFile=-/etc/default/container-dhcp-server ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-haproxy.service new/containers-systemd-0.0+git20201113.5e435e8/container-haproxy.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-haproxy.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-haproxy.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-haproxy EnvironmentFile=-/etc/default/container-haproxy ExecStartPre=-/usr/bin/podman stop haproxy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-mariadb.service new/containers-systemd-0.0+git20201113.5e435e8/container-mariadb.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-mariadb.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-mariadb.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-mariadb EnvironmentFile=-/etc/default/container-mariadb ExecStartPre=-/usr/bin/mkdir -p ${DATA_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-nginx.service new/containers-systemd-0.0+git20201113.5e435e8/container-nginx.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-nginx.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-nginx.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-nginx EnvironmentFile=-/etc/default/container-nginx ExecStartPre=-/usr/bin/mkdir -p ${NGINX_CFG} ${HTDOCS_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-openldap.default new/containers-systemd-0.0+git20201113.5e435e8/container-openldap.default --- old/containers-systemd-0.0+git20201027.f1d33d8/container-openldap.default 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-openldap.default 2020-11-13 15:10:23.000000000 +0100 @@ -17,9 +17,19 @@ # Name of the path where the files with the passwords for # LDAP_ADMIN_PASSWORD and LDAP_CONFIG_PASSWORD can be found. The file # names needs to be the ones of the variable names and should not -# be readable for anybody else. +# be readable for anybody else. It will be mounted to +# "/etc/openldap-secrets" inside the container. SECRETS_DIR="/etc/openldap-secrets" +# Locations of the files with the passwords for the admin, config +# and mail account reader users. +LDAP_ADMIN_PASSWORD_FILE=/etc/openldap-secrets/LDAP_ADMIN_PASSWORD +LDAP_CONFIG_PASSWORD_FILE=/etc/openldap-secrets/LDAP_CONFIG_PASSWORD +MAIL_ACCOUNT_READER_PASSWORD_FILE=/etc/openldap-secrets/MAIL_ACCOUNT_READER_PASSWORD + +# Ports which needs to be exported +LDAP_PORTS="-p 389:389 -p 636:636" + # 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+git20201027.f1d33d8/container-openldap.service new/containers-systemd-0.0+git20201113.5e435e8/container-openldap.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-openldap.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-openldap.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,14 +5,14 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-openldap EnvironmentFile=-/etc/default/container-openldap ExecStartPre=-/usr/bin/mkdir -p ${LDAP_DB_DIR} ${LDAP_ETC_DIR} ${LDAP_CERTS_DIR} ExecStartPre=-/usr/bin/podman stop openldap ExecStartPre=-/usr/bin/podman rm openldap ExecStartPre=-/usr/bin/podman pull ${OPENLDAP_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${LDAP_DB_DIR}:/var/lib/ldap:Z -v ${LDAP_ETC_DIR}:/etc/openldap/slapd.d:Z -v ${SECRETS_DIR}:/etc/openldap-secrets:Z -v ${LDAP_CERTS_DIR}:/etc/openldap/certs:z -p 389:389 -p 636:636 -e LDAP_ADMIN_PASSWORD_FILE=/etc/openldap-secrets/LDAP_ADMIN_PASSWORD -e LDAP_CONFIG_PASSWORD_FILE=/etc/openldap-secrets/LDAP_CONFIG_PASSWORD -e MAIL_ACCOUNT_READER_PASSWORD_FILE=/etc/openldap-secrets/MAIL_ACCOUNT_READER_PASSWORD -e LDAP_DOMAIN=${LDAP_DOMAIN} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_ORGANIZATION=${LDAP_ORGANIZATION} -e LDAP_SEED_LDIF_PATH=${LDAP_SEED_LDIF_PATH} -e LDAP_SEED_SCHEMA_PATH=${LDAP_SEED_SCHEMA_PATH} -e LDAP_TLS=${LDAP_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e LDAP_TLS_CA_KEY=${LDAP_TLS_CA_KEY} -e LDAP_TLS_CRT=${LDAP_TLS_CRT} -e LDAP_TLS_KEY=${LDAP_TLS_KEY} -e LDAP_TLS_ENFORCE=${LDAP_TLS_ENFORCE} -e LDAP_TLS_VERIFY_CLIENT=${LDAP_TLS_VERIFY_CLIENT} -e LDAP_NOFILE=${LDAP_NOFILE} -e LDAP_UID=${LDAP_UID} -e LDAP_GID=${LDAP_GID} -e SLAPD_LOG_LEVEL=${SLAPD_LOG_LEVEL} -e SETUP_FOR_MAILSERVER=${SETUP_FOR_MAILSERVER} -e DEBUG=${DEBUG} --name openldap ${OPENLDAP_IMAGE_PATH}" +ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${LDAP_DB_DIR}:/var/lib/ldap:Z -v ${LDAP_ETC_DIR}:/etc/openldap/slapd.d:Z -v ${SECRETS_DIR}:/etc/openldap-secrets:Z -v ${LDAP_CERTS_DIR}:/etc/openldap/certs:z ${LDAP_PORTS} -e LDAP_ADMIN_PASSWORD_FILE=${LDAP_ADMIN_PASSWORD_FILE} -e LDAP_CONFIG_PASSWORD_FILE=${LDAP_CONFIG_PASSWORD_FILE} -e MAIL_ACCOUNT_READER_PASSWORD_FILE=${MAIL_ACCOUNT_READER_PASSWORD_FILE} -e LDAP_DOMAIN=${LDAP_DOMAIN} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_ORGANIZATION=${LDAP_ORGANIZATION} -e LDAP_SEED_LDIF_PATH=${LDAP_SEED_LDIF_PATH} -e LDAP_SEED_SCHEMA_PATH=${LDAP_SEED_SCHEMA_PATH} -e LDAP_TLS=${LDAP_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e LDAP_TLS_CA_KEY=${LDAP_TLS_CA_KEY} -e LDAP_TLS_CRT=${LDAP_TLS_CRT} -e LDAP_TLS_KEY=${LDAP_TLS_KEY} -e LDAP_TLS_ENFORCE=${LDAP_TLS_ENFORCE} -e LDAP_TLS_VERIFY_CLIENT=${LDAP_TLS_VERIFY_CLIENT} -e LDAP_NOFILE=${LDAP_NOFILE} -e LDAP_UID=${LDAP_UID} -e LDAP_GID=${LDAP_GID} -e SLAPD_LOG_LEVEL=${SLAPD_LOG_LEVEL} -e SETUP_FOR_MAILSERVER=${SETUP_FOR_MAILSERVER} -e DEBUG=${DEBUG} --name openldap ${OPENLDAP_IMAGE_PATH}" ExecStop=/usr/bin/podman stop openldap KillMode=none Type=forking diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-postfix.default new/containers-systemd-0.0+git20201113.5e435e8/container-postfix.default --- old/containers-systemd-0.0+git20201027.f1d33d8/container-postfix.default 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-postfix.default 2020-11-13 15:10:23.000000000 +0100 @@ -21,9 +21,17 @@ # Name of the path where the files with the passwords for # LDAP_ADMIN_PASSWORD and LDAP_CONFIG_PASSWORD can be found. The file # names needs to be the ones of the variable names and should not -# be readable for anybody else. +# be readable for anybody else. This directory is mounted as volume +# to "/etc/postfix-secrets" inside the container. SECRETS_DIR="/etc/postfix-secrets" +# Location of the file with the password to authenticate to +# a mail server. +SMTP_PASSWORD_FILE="/etc/postfix-secrets/SMTP_PASSWORD" + +# Ports which needs to be exported +POSTFIX_PORTS="-p 25:25 -p 587:587" + # Extra arguments for podman to start the container PODMAN_EXTRA_ARGS="" @@ -38,3 +46,7 @@ # If we use LDAP, use a TLS secured connection LDAP_USE_TLS=1 + +# Location of the file with the password to authenticate a bind +# with the bind_dn distinguished name. +LDAP_BIND_PASSWORD_FILE="/etc/postfix-secrets/LDAP_BIND_PASSWORD" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-postfix.service new/containers-systemd-0.0+git20201113.5e435e8/container-postfix.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-postfix.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-postfix.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,14 +5,14 @@ Wants=network-online.target container-openldap.service [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-postfix EnvironmentFile=-/etc/default/container-postfix ExecStartPre=-/usr/bin/mkdir -p ${POSTFIX_SPOOL_DIR} ${POSTFIX_VMAIL_DIR} ${EXTRA_PKI_DIR} 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 -p 25:25 -p 587:587 -e SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_USERNAME=${SMTP_USERNAME} -e SMTP_PASSWORD_FILE=/etc/postfix-secrets/SMTP_PASSWORD -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_MAIL_READER_PASSWORD_FILE=/etc/postfix-secrets/LDAP_MAIL_READER_PASSWORD -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 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201027.f1d33d8/container-squid.service new/containers-systemd-0.0+git20201113.5e435e8/container-squid.service --- old/containers-systemd-0.0+git20201027.f1d33d8/container-squid.service 2020-10-27 13:12:15.000000000 +0100 +++ new/containers-systemd-0.0+git20201113.5e435e8/container-squid.service 2020-11-13 15:10:23.000000000 +0100 @@ -5,7 +5,7 @@ Wants=network-online.target [Service] -Restart=on-failure +Restart=on-abnormal EnvironmentFile=/usr/etc/default/container-squid EnvironmentFile=-/etc/default/container-squid ExecStartPre=-/usr/bin/podman stop squid _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
