From d382e185d7d0f8efd3dc6e382f6cc981cc1b9252 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 14 Feb 2023 14:24:16 +0100 Subject: [PATCH] TLS --- seed/README.md | 5 +- seed/apache/README.md | 4 +- seed/apache/dictionaries/20_web.xml | 3 - seed/apache/manual/image/preinstall/apache.sh | 2 +- seed/apache/templates/server.ca | 1 - seed/apache/templates/server.crt | 1 - seed/apache/templates/server.key | 1 - seed/apache/templates/ssl.conf | 6 +- seed/base-debian-bullseye/README.md | 1 + ...an-bullseye.xml => 00_debian-bullseye.xml} | 0 seed/base-debian/README.md | 1 + ...{11-debian-base.xml => 11_debian-base.xml} | 0 ...{17-debian-base.xml => 17_debian-base.xml} | 0 seed/base-debian/templates/tmpfile-tmp.conf | 2 + seed/base-fedora-35/README.md | 1 + .../{11-fedora-35.xml => 11_fedora-35.xml} | 0 seed/base-fedora-36/README.md | 4 +- ...dora-version.xml => 11_fedora-version.xml} | 0 seed/base-fedora-37/README.md | 1 + ...dora-version.xml => 11_fedora-version.xml} | 0 seed/base-fedora/README.md | 2 +- ...{11-fedora-base.xml => 11_fedora-base.xml} | 0 ...{17-fedora-base.xml => 17_fedora-base.xml} | 0 seed/base-machine/README.md | 3 +- seed/base-machine/applicationservice.yml | 1 + .../dictionaries/{12-base.xml => 12_base.xml} | 0 seed/base-machine/extras/machine/00_base.xml | 2 +- seed/base-machine/funcs/funcs.py | 4 +- .../dictionaries/{00-base.xml => 00_base.xml} | 0 seed/base/funcs/base.py | 5 +- seed/dns-external/README.md | 4 +- ...4-dns-external.xml => 14_dns-external.xml} | 0 .../{13-dns-local.xml => 13_dns-local.xml} | 0 seed/dotclear/README.md | 43 - seed/dotclear/applicationservice.yml | 8 - seed/dotclear/dictionaries/40_dotclear.xml | 26 - .../manual/image/postinstall/dotclear.sh | 16 - .../manual/image/preinstall/dotclear.sh | 1 - seed/dotclear/templates/config.php | 108 - seed/dotclear/templates/dotclear.nginx.conf | 34 - seed/dotclear/templates/dotclear.service | 18 - seed/dotclear/templates/tmpfile-dotclear.conf | 4 - seed/dovecot/FIXME | 4 + seed/dovecot/README.md | 18 +- seed/dovecot/dictionaries/26_dovecot.xml | 65 +- seed/dovecot/templates/10-ssl.conf | 10 +- seed/dovecot/templates/ca_IMAPServer.crt | 1 - seed/dovecot/templates/ca_MailServer.crt | 1 - seed/dovecot/templates/dovecot-ldap.conf.ext | 6 +- seed/dovecot/templates/dovecot.crt | 8 - seed/dovecot/templates/dovecot.key | 1 - seed/dovecot/templates/ldapsource.cf | 6 +- seed/dovecot/templates/main.cf | 16 +- seed/dovecot/templates/postfix.crt | 8 - seed/dovecot/templates/postfix.key | 1 - seed/dovecot/templates/postfix.pem | 2 - seed/dovecot/templates/sni | 4 +- seed/dovecot/templates/tmpfile-postfix.conf | 1 + seed/forgejo/README.md | 12 +- seed/forgejo/dictionaries/31_forgejo.xml | 3 - seed/forgejo/templates/app.ini | 4 +- seed/galette/README.md | 44 - seed/galette/applicationservice.yml | 8 - seed/galette/dictionaries/40_galette.xml | 9 - .../manual/image/postinstall/galette.sh | 8 - .../postinstall/galette/ajouter_adherent.php | 810 ---- .../galette/ajouter_contribution.php | 392 -- .../galette/etiquettes_adherents.php | 208 - .../galette/etiquettes_adherents_2.php | 127 - .../image/postinstall/galette/footer.php | 168 - .../image/postinstall/galette/galette.css | 414 -- .../postinstall/galette/gestion_adherents.php | 449 -- .../galette/gestion_contributions.php | 465 -- .../image/postinstall/galette/header.php | 46 - .../image/postinstall/galette/icon-mini.png | Bin 1939 -> 0 bytes .../image/postinstall/galette/images/asc.png | Bin 150 -> 0 bytes .../image/postinstall/galette/images/desc.png | Bin 151 -> 0 bytes .../postinstall/galette/images/galette.jpg | Bin 2265 -> 0 bytes .../postinstall/galette/images/icon-edit.png | Bin 231 -> 0 bytes .../postinstall/galette/images/icon-empty.png | Bin 355 -> 0 bytes .../galette/images/icon-female.png | Bin 783 -> 0 bytes .../postinstall/galette/images/icon-mail.png | Bin 556 -> 0 bytes .../postinstall/galette/images/icon-male.png | Bin 780 -> 0 bytes .../postinstall/galette/images/icon-money.png | Bin 231 -> 0 bytes .../postinstall/galette/images/icon-star.png | Bin 451 -> 0 bytes .../postinstall/galette/images/icon-trash.png | Bin 205 -> 0 bytes .../includes/adodb/adodb-error.inc.php | 258 -- .../includes/adodb/adodb-errorhandler.inc.php | 79 - .../includes/adodb/adodb-errorpear.inc.php | 88 - .../includes/adodb/adodb-exceptions.inc.php | 80 - .../includes/adodb/adodb-iterator.inc.php | 84 - .../galette/includes/adodb/adodb-lib.inc.php | 1016 ----- .../includes/adodb/adodb-pager.inc.php | 290 -- .../galette/includes/adodb/adodb-pear.inc.php | 374 -- .../galette/includes/adodb/adodb-perf.inc.php | 1053 ----- .../galette/includes/adodb/adodb-php4.inc.php | 16 - .../galette/includes/adodb/adodb-time.inc.php | 1312 ------ .../includes/adodb/adodb-xmlschema.inc.php | 2221 --------- .../galette/includes/adodb/adodb.inc.php | 3963 ----------------- .../includes/adodb/contrib/toxmlrpc.inc.php | 183 - .../adodb/cute_icons_for_site/adodb.gif | Bin 1091 -> 0 bytes .../adodb/cute_icons_for_site/adodb2.gif | Bin 1458 -> 0 bytes .../adodb/drivers/adodb-mysqli.inc.php | 986 ---- .../adodb/drivers/adodb-mysqlt.inc.php | 138 - .../adodb/drivers/adodb-odbtp.inc.php | 732 --- .../adodb/drivers/adodb-odbtp_unicode.inc.php | 39 - .../adodb/drivers/adodb-pdo_mysql.inc.php | 146 - .../adodb/drivers/adodb-pdo_oci.inc.php | 93 - .../includes/adodb/lang/adodb-fr.inc.php | 33 - .../galette/includes/adodb/license.txt | 182 - .../adodb/pear/Auth/Container/ADOdb.php | 413 -- .../includes/adodb/pear/readme.Auth.txt | 20 - .../includes/adodb/perf/perf-mysql.inc.php | 315 -- .../galette/includes/adodb/pivottable.inc.php | 185 - .../galette/includes/adodb/readme.txt | 62 - .../galette/includes/adodb/rsfilter.inc.php | 61 - .../galette/includes/adodb/server.php | 100 - .../adodb/session/adodb-compress-bzip2.php | 118 - .../adodb/session/adodb-compress-gzip.php | 93 - .../adodb/session/adodb-cryptsession.php | 24 - .../adodb/session/adodb-encrypt-mcrypt.php | 109 - .../adodb/session/adodb-encrypt-md5.php | 39 - .../adodb/session/adodb-encrypt-secret.php | 48 - .../adodb/session/adodb-encrypt-sha1.php | 32 - .../includes/adodb/session/adodb-sess.txt | 131 - .../adodb/session/adodb-session-clob.php | 23 - .../includes/adodb/session/adodb-session.php | 917 ---- .../adodb/session/adodb-sessions.mysql.sql | 16 - .../adodb/session/adodb-sessions.oracle.sql | 16 - .../includes/adodb/session/crypt.inc.php | 161 - .../includes/adodb/session/session_schema.xml | 26 - .../galette/includes/adodb/toexport.inc.php | 133 - .../galette/includes/adodb/tohtml.inc.php | 195 - .../galette/includes/adodb/xmlschema.dtd | 39 - .../includes/adodb/xsl/convert-0.1-0.2.xsl | 205 - .../includes/adodb/xsl/convert-0.2-0.1.xsl | 207 - .../galette/includes/adodb/xsl/remove-0.2.xsl | 54 - .../galette/includes/database.inc.php | 106 - .../galette/includes/functions.inc.php | 150 - .../postinstall/galette/includes/lang.inc.php | 13 - .../galette/includes/phppdflib/COPYING | 339 -- .../includes/phppdflib/chart.class.php | 130 - .../includes/phppdflib/import.class.php | 443 -- .../includes/phppdflib/packer.class.php | 357 -- .../includes/phppdflib/phppdflib.class.php | 1687 ------- .../galette/includes/phppdflib/strlen.inc.php | 290 -- .../includes/phppdflib/template.class.php | 222 - .../galette/includes/session.inc.php | 56 - .../image/postinstall/galette/index.php | 125 - .../postinstall/galette/lang/lang_english.php | 383 -- .../postinstall/galette/lang/lang_french.php | 428 -- .../image/postinstall/galette/legumes.jpg | Bin 24358 -> 0 bytes .../manual/image/postinstall/galette/log.php | 215 - .../image/postinstall/galette/lostpasswd.php | 149 - .../postinstall/galette/mailing_adherents.php | 949 ---- .../image/postinstall/galette/paysage.jpg | Bin 6158 -> 0 bytes .../image/postinstall/galette/point.png | Bin 271 -> 0 bytes .../image/postinstall/galette/preferences.php | 518 --- .../image/postinstall/galette/style.css | 170 - .../postinstall/galette/voir_adherent.php | 331 -- .../manual/image/preinstall/galette.sh | 1 - seed/galette/templates/config.inc.php | 9 - seed/galette/templates/galette.nginx.conf | 34 - seed/gitea/README.md | 3 +- seed/host-systemd-machined/README.md | 18 +- .../{21-machined.xml => 21_machined.xml} | 0 .../{00-machined.xml => 00_machined.xml} | 18 +- .../templates/network-script | 1 + seed/host-systemd-machined/templates/nspawn | 3 + .../templates/systemd-nspawn@.conf | 3 +- .../templates/tls-script | 47 + seed/imap-client/README.md | 2 +- .../dictionaries/21_imap_client.xml | 5 +- seed/imap-client/templates/ca_IMAPServer.crt | 1 - seed/ldap-client/README.md | 12 +- .../dictionaries/21_ldap-client.xml | 29 +- seed/ldap-client/templates/ca_LDAP.crt | 1 - seed/ldap-client/templates/ldap.conf | 6 +- seed/ldap-client/templates/ldap_client.crt | 1 - seed/ldap-client/templates/ldap_client.key | 5 - seed/lemonldap/README.md | 14 +- seed/lemonldap/applicationservice.yml | 3 +- seed/lemonldap/templates/handler-nginx.conf | 6 +- seed/lemonldap/templates/portal-nginx.conf | 6 +- seed/letsencrypt/README.md | 41 - seed/letsencrypt/applicationservice.yml | 5 - .../dictionaries/20-letsencrypt.xml | 23 - seed/mailman/README.md | 18 +- seed/mailman/dictionaries/31_mailman.xml | 12 +- seed/mailman/extras/mailman/20_mailman.xml | 6 +- .../manual/image/postinstall/postorius.sh | 1 + seed/mailman/templates/config-nginx.conf | 148 +- seed/mailman/templates/mailman-web.py | 47 +- seed/mailman/templates/mailman.cfg | 15 +- seed/mailman/templates/mailman3.service | 2 +- seed/mailman/templates/tmpfile-mailman.conf | 2 + seed/mariadb-client/README.md | 6 +- seed/mariadb/README.md | 3 +- seed/nextcloud/README.md | 5 +- seed/nextcloud/dictionaries/31_nextcloud.xml | 2 + seed/nextcloud/templates/nextcloud-config.php | 12 +- seed/nginx-common/README.md | 7 +- seed/nginx-common/dictionaries/21_nginx.xml | 27 - seed/nginx-common/templates/default | 124 +- seed/nginx-common/templates/nginx.conf.Debian | 151 +- seed/nginx-common/templates/nginx.conf.Fedora | 10 +- seed/nginx-https/README.md | 4 +- seed/nginx-https/templates/nginx.crt | 3 - seed/nginx-reverse-proxy/README.md | 14 +- .../dictionaries/20_nginx.xml | 9 - .../dictionaries/25_nginx.xml | 15 +- .../nginx/{00-nginx.xml => 00_nginx.xml} | 23 +- seed/nginx-reverse-proxy/funcs/nginx.py | 2 + .../nginx-reverse-proxy/templates/ca_HTTP.crt | 3 - .../templates/ca_InternalReverseProxy.crt | 3 - .../templates/certificate.crt | 1 - seed/nginx-reverse-proxy/templates/nginx.crt | 3 - .../nginx-reverse-proxy/templates/private.key | 1 - .../templates/revprox-nginx.conf | 119 +- seed/nginx-static/README.md | 1 + .../dictionaries/22_nginx_static.xml | 11 +- .../templates/tmpfiles.nginx_static.conf | 2 +- seed/nsd/README.md | 7 +- seed/oauth2-client/README.md | 22 +- seed/odoo/README.md | 31 +- seed/odoo/templates/odoo.service | 6 +- seed/openldap/README.md | 53 +- .../dictionaries/21_openldap-server.xml | 5 +- seed/openldap/templates/config.ldif | 7 +- seed/openldap/templates/openldap.crt | 5 - seed/openldap/templates/openldap.key | 1 - seed/peertube/README.md | 7 +- seed/peertube/templates/production.yaml | 2 +- seed/php-fpm/README.md | 7 +- seed/php/README.md | 22 +- seed/piwigo/README.md | 9 +- seed/pki-tls/README.md | 16 + seed/pki-tls/applicationservice.yml | 2 + seed/pki-tls/dictionaries/20_tls.xml | 10 + .../funcs/letsencrypt.py | 0 seed/{base => pki-tls}/funcs/x509.py | 0 seed/{letsencrypt => pki-tls}/infos.md | 0 seed/pki-tls/templates/0certificate.conf | 35 + seed/postfix-lmtp-relay/README.md | 2 +- .../extras/lmtp/{00-lmtp.xml => 00_lmtp.xml} | 2 +- seed/postfix-relay/README.md | 12 +- .../postfix-relay/dictionaries/30_postfix.xml | 20 +- .../postfix-relay/templates/ca_MailServer.crt | 1 - seed/postfix-relay/templates/main.cf | 15 +- seed/postfix-relay/templates/postfix.crt | 1 - seed/postfix-relay/templates/postfix.key | 1 - seed/postgresql-client/README.md | 1 - .../dictionaries/23_postgresql.xml | 26 +- .../templates/ca_PostgreSQL.crt | 2 - .../templates/postgresql.crt | 1 - .../templates/postgresql.key | 1 - .../templates/postgresql.pass2 | 1 + .../templates/postgresqlclient.service | 8 +- seed/postgresql/README.md | 37 +- .../postgresql/dictionaries/22_postgresql.xml | 6 +- seed/postgresql/templates/ca_PostgreSQL.crt | 1 - seed/postgresql/templates/config.yml | 0 seed/postgresql/templates/postgresql.conf | 6 +- seed/postgresql/templates/postgresql.crt | 1 - seed/postgresql/templates/postgresql.key | 1 - seed/provider-systemd-machined/README.md | 13 +- .../{10-machined.xml => 10_machined.xml} | 0 .../{16-machined.xml => 16_machined.xml} | 0 seed/redis-client/README.md | 6 +- seed/redis-client/dictionaries/23_redis.xml | 5 +- seed/redis-client/templates/ca_Redis.crt | 1 - .../templates/redis-client.service | 2 +- seed/redis-client/templates/redis.crt | 1 - seed/redis-client/templates/redis.key | 1 - seed/redis-client/templates/redis.pem | 5 - seed/redis/README.md | 17 +- seed/redis/dictionaries/90_redis.xml | 6 +- seed/redis/templates/ca_Redis.crt | 1 - seed/redis/templates/redis.conf | 6 +- seed/redis/templates/redis.crt | 1 - seed/redis/templates/redis.key | 1 - seed/redis/templates/sysuser-redis.conf | 2 +- seed/relay-lmtp-client/README.md | 2 +- seed/relay-mail-client/README.md | 2 +- .../dictionaries/20_smtp_client.xml | 9 +- .../templates/ca_MailRelay.crt | 1 - seed/reverse-proxy-client/README.md | 7 +- .../dictionaries/21_revprox_client.xml | 47 +- .../funcs/revprox_client.py | 15 +- .../templates/ca_InternalReverseProxy.crt | 1 - .../templates/revprox.crt | 2 - .../templates/revprox.key | 1 - seed/roundcube/README.md | 13 +- seed/roundcube/dictionaries/31_roundcube.xml | 9 +- seed/roundcube/templates/ca_MailServer.crt | 1 - seed/roundcube/templates/config.inc.php | 10 +- seed/sensmotdire/README.md | 42 - seed/sensmotdire/applicationservice.yml | 7 - .../dictionaries/40_sensmotdire.xml | 9 - .../extras/machine/20_sensmotdire.xml | 20 - .../manual/image/postinstall/sensmotdire.sh | 8 - .../image/postinstall/sensmotdire/about.php | 14 - .../postinstall/sensmotdire/accessibility.php | 13 - .../postinstall/sensmotdire/add_browser.php | 15 - .../postinstall/sensmotdire/autosuggest.php | 76 - .../sensmotdire/css/sensmotdire.css | 394 -- .../postinstall/sensmotdire/f0000112.html | 53 - .../image/postinstall/sensmotdire/faq.php | 13 - .../image/postinstall/sensmotdire/favicon.png | Bin 727 -> 0 bytes .../sensmotdire/images/as_pointer.gif | Bin 67 -> 0 bytes .../sensmotdire/images/hl_corner_bl.gif | Bin 73 -> 0 bytes .../sensmotdire/images/hl_corner_br.gif | Bin 73 -> 0 bytes .../sensmotdire/images/hl_corner_tl.gif | Bin 73 -> 0 bytes .../sensmotdire/images/hl_corner_tr.gif | Bin 73 -> 0 bytes .../images/sensmotdire-background-widget.png | Bin 4147 -> 0 bytes .../images/sensmotdire-background.png | Bin 11964 -> 0 bytes .../sensmotdire/images/sensmotdire-logo.png | Bin 7067 -> 0 bytes .../sensmotdire/images/sensmotdire.png | Bin 727 -> 0 bytes .../sensmotdire/images/twisty-do-down.gif | Bin 1038 -> 0 bytes .../sensmotdire/images/twisty-do-hidden.gif | Bin 1037 -> 0 bytes .../sensmotdire/images/twisty-down.gif | Bin 834 -> 0 bytes .../sensmotdire/images/twisty-hidden.gif | Bin 837 -> 0 bytes .../sensmotdire/images/widget-google-shot.jpg | Bin 7158 -> 0 bytes .../image/postinstall/sensmotdire/index.php | 123 - .../postinstall/sensmotdire/js/.htaccess | 4 - .../postinstall/sensmotdire/js/.htaccess.swp | Bin 12288 -> 0 bytes .../sensmotdire/js/bsn.AutoSuggest_c_2.0.js | 745 ---- .../sensmotdire/js/sensmotdire.js.php | 296 -- .../postinstall/sensmotdire/js/tabber.js | 522 --- .../image/postinstall/sensmotdire/lang-fr.php | 173 - .../image/postinstall/sensmotdire/lib.php | 551 --- .../image/postinstall/sensmotdire/plugin.php | 42 - .../image/postinstall/sensmotdire/rss20.xml | 67 - .../postinstall/sensmotdire/sensmotdire.css | 317 -- .../image/postinstall/sensmotdire/test.php | 30 - .../image/postinstall/sensmotdire/widget.php | 53 - .../manual/image/preinstall/sensmotdire.sh | 1 - seed/sensmotdire/templates/config.php | 12 - .../templates/sensmotdire.nginx.conf | 34 - seed/speedtest-rs/README.md | 9 +- .../extras/machine/20_speedtest-rs.xml} | 0 seed/speedtest-rs/templates/config.env | 6 +- seed/systemd/README.md | 1 + .../{15-systemd.xml => 15_systemd.xml} | 2 +- seed/tls/applicationservice.yml | 7 + seed/tls/dictionaries/26_tls.xml | 43 + .../extras/machine/20_tls.xml} | 9 +- seed/tls/manual/image/postinstall/autosign.py | 195 + .../manual/image/postinstall/letsencrypt.py | 75 + seed/tls/manual/image/postinstall/tls.sh | 11 + .../image/postinstall/update-certificates | 5 + seed/tls/manual/image/postinstall/x509.py | 70 + seed/tls/manual/image/preinstall/tls.sh | 1 + seed/tls/templates/certificates.yml | 15 + seed/tls/templates/configuration.yml | 3 + seed/tls/templates/sysuser-tls.conf | 2 + seed/tls/templates/tls.service | 13 + seed/tls/templates/tls.timer | 9 + seed/tls/templates/tmpfile-tls.conf | 3 + seed/unbound/README.md | 7 +- seed/vaultwarden/README.md | 11 +- .../templates/vaultwarden_config.env | 2 +- seed/znc/README.md | 20 +- seed/znc/dictionaries/40_znc.xml | 11 +- seed/znc/templates/znc.conf | 4 +- seed/znc/templates/znc.crt | 2 - seed/znc/templates/znc.key | 1 - 367 files changed, 1516 insertions(+), 32145 deletions(-) delete mode 100644 seed/apache/templates/server.ca delete mode 100644 seed/apache/templates/server.crt delete mode 100644 seed/apache/templates/server.key rename seed/base-debian-bullseye/dictionaries/{00-debian-bullseye.xml => 00_debian-bullseye.xml} (100%) rename seed/base-debian/dictionaries/{11-debian-base.xml => 11_debian-base.xml} (100%) rename seed/base-debian/dictionaries/{17-debian-base.xml => 17_debian-base.xml} (100%) rename seed/base-fedora-35/dictionaries/{11-fedora-35.xml => 11_fedora-35.xml} (100%) rename seed/base-fedora-36/dictionaries/{11-fedora-version.xml => 11_fedora-version.xml} (100%) rename seed/base-fedora-37/dictionaries/{11-fedora-version.xml => 11_fedora-version.xml} (100%) rename seed/base-fedora/dictionaries/{11-fedora-base.xml => 11_fedora-base.xml} (100%) rename seed/base-fedora/dictionaries/{17-fedora-base.xml => 17_fedora-base.xml} (100%) rename seed/base-machine/dictionaries/{12-base.xml => 12_base.xml} (100%) rename seed/base/dictionaries/{00-base.xml => 00_base.xml} (100%) rename seed/dns-external/dictionaries/{14-dns-external.xml => 14_dns-external.xml} (100%) rename seed/dns-local/dictionaries/{13-dns-local.xml => 13_dns-local.xml} (100%) delete mode 100644 seed/dotclear/README.md delete mode 100644 seed/dotclear/applicationservice.yml delete mode 100644 seed/dotclear/dictionaries/40_dotclear.xml delete mode 100644 seed/dotclear/manual/image/postinstall/dotclear.sh delete mode 100644 seed/dotclear/manual/image/preinstall/dotclear.sh delete mode 100644 seed/dotclear/templates/config.php delete mode 100644 seed/dotclear/templates/dotclear.nginx.conf delete mode 100644 seed/dotclear/templates/dotclear.service delete mode 100644 seed/dotclear/templates/tmpfile-dotclear.conf delete mode 100644 seed/dovecot/templates/ca_IMAPServer.crt delete mode 100644 seed/dovecot/templates/ca_MailServer.crt delete mode 100644 seed/dovecot/templates/dovecot.crt delete mode 100644 seed/dovecot/templates/dovecot.key delete mode 100644 seed/dovecot/templates/postfix.crt delete mode 100644 seed/dovecot/templates/postfix.key delete mode 100644 seed/dovecot/templates/postfix.pem delete mode 100644 seed/galette/README.md delete mode 100644 seed/galette/applicationservice.yml delete mode 100644 seed/galette/dictionaries/40_galette.xml delete mode 100644 seed/galette/manual/image/postinstall/galette.sh delete mode 100644 seed/galette/manual/image/postinstall/galette/ajouter_adherent.php delete mode 100644 seed/galette/manual/image/postinstall/galette/ajouter_contribution.php delete mode 100644 seed/galette/manual/image/postinstall/galette/etiquettes_adherents.php delete mode 100644 seed/galette/manual/image/postinstall/galette/etiquettes_adherents_2.php delete mode 100644 seed/galette/manual/image/postinstall/galette/footer.php delete mode 100644 seed/galette/manual/image/postinstall/galette/galette.css delete mode 100644 seed/galette/manual/image/postinstall/galette/gestion_adherents.php delete mode 100644 seed/galette/manual/image/postinstall/galette/gestion_contributions.php delete mode 100644 seed/galette/manual/image/postinstall/galette/header.php delete mode 100644 seed/galette/manual/image/postinstall/galette/icon-mini.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/asc.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/desc.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/galette.jpg delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-edit.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-empty.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-female.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-mail.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-male.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-money.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-star.png delete mode 100644 seed/galette/manual/image/postinstall/galette/images/icon-trash.png delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-error.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-errorhandler.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-errorpear.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-exceptions.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-iterator.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-lib.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-pager.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-pear.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-perf.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-php4.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-time.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb-xmlschema.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/adodb.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/contrib/toxmlrpc.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/cute_icons_for_site/adodb.gif delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/cute_icons_for_site/adodb2.gif delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/drivers/adodb-mysqli.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/drivers/adodb-mysqlt.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/drivers/adodb-odbtp.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/drivers/adodb-odbtp_unicode.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/drivers/adodb-pdo_mysql.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/drivers/adodb-pdo_oci.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/lang/adodb-fr.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/license.txt delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/pear/Auth/Container/ADOdb.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/pear/readme.Auth.txt delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/perf/perf-mysql.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/pivottable.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/readme.txt delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/rsfilter.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/server.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-compress-bzip2.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-compress-gzip.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-cryptsession.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-encrypt-mcrypt.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-encrypt-md5.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-encrypt-secret.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-encrypt-sha1.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-sess.txt delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-session-clob.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-session.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-sessions.mysql.sql delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/adodb-sessions.oracle.sql delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/crypt.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/session/session_schema.xml delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/toexport.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/tohtml.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/xmlschema.dtd delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/xsl/convert-0.1-0.2.xsl delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/xsl/convert-0.2-0.1.xsl delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/adodb/xsl/remove-0.2.xsl delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/database.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/functions.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/lang.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/COPYING delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/chart.class.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/import.class.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/packer.class.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/phppdflib.class.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/strlen.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/phppdflib/template.class.php delete mode 100644 seed/galette/manual/image/postinstall/galette/includes/session.inc.php delete mode 100644 seed/galette/manual/image/postinstall/galette/index.php delete mode 100644 seed/galette/manual/image/postinstall/galette/lang/lang_english.php delete mode 100644 seed/galette/manual/image/postinstall/galette/lang/lang_french.php delete mode 100644 seed/galette/manual/image/postinstall/galette/legumes.jpg delete mode 100644 seed/galette/manual/image/postinstall/galette/log.php delete mode 100644 seed/galette/manual/image/postinstall/galette/lostpasswd.php delete mode 100644 seed/galette/manual/image/postinstall/galette/mailing_adherents.php delete mode 100644 seed/galette/manual/image/postinstall/galette/paysage.jpg delete mode 100644 seed/galette/manual/image/postinstall/galette/point.png delete mode 100644 seed/galette/manual/image/postinstall/galette/preferences.php delete mode 100644 seed/galette/manual/image/postinstall/galette/style.css delete mode 100644 seed/galette/manual/image/postinstall/galette/voir_adherent.php delete mode 100644 seed/galette/manual/image/preinstall/galette.sh delete mode 100644 seed/galette/templates/config.inc.php delete mode 100644 seed/galette/templates/galette.nginx.conf rename seed/host-systemd-machined/dictionaries/{21-machined.xml => 21_machined.xml} (100%) rename seed/host-systemd-machined/extras/machined/{00-machined.xml => 00_machined.xml} (73%) create mode 100644 seed/host-systemd-machined/templates/tls-script delete mode 100644 seed/imap-client/templates/ca_IMAPServer.crt delete mode 100644 seed/ldap-client/templates/ca_LDAP.crt delete mode 100644 seed/ldap-client/templates/ldap_client.crt delete mode 100644 seed/ldap-client/templates/ldap_client.key delete mode 100644 seed/letsencrypt/README.md delete mode 100644 seed/letsencrypt/applicationservice.yml delete mode 100644 seed/letsencrypt/dictionaries/20-letsencrypt.xml delete mode 100644 seed/nginx-https/templates/nginx.crt delete mode 100644 seed/nginx-reverse-proxy/dictionaries/20_nginx.xml rename seed/nginx-reverse-proxy/extras/nginx/{00-nginx.xml => 00_nginx.xml} (67%) delete mode 100644 seed/nginx-reverse-proxy/templates/ca_HTTP.crt delete mode 100644 seed/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt delete mode 100644 seed/nginx-reverse-proxy/templates/certificate.crt delete mode 100644 seed/nginx-reverse-proxy/templates/nginx.crt delete mode 100644 seed/nginx-reverse-proxy/templates/private.key delete mode 100644 seed/openldap/templates/openldap.crt delete mode 100644 seed/openldap/templates/openldap.key create mode 100644 seed/pki-tls/README.md create mode 100644 seed/pki-tls/applicationservice.yml create mode 100644 seed/pki-tls/dictionaries/20_tls.xml rename seed/{letsencrypt => pki-tls}/funcs/letsencrypt.py (100%) rename seed/{base => pki-tls}/funcs/x509.py (100%) rename seed/{letsencrypt => pki-tls}/infos.md (100%) create mode 100644 seed/pki-tls/templates/0certificate.conf rename seed/postfix-lmtp-relay/extras/lmtp/{00-lmtp.xml => 00_lmtp.xml} (86%) delete mode 100644 seed/postfix-relay/templates/ca_MailServer.crt delete mode 100644 seed/postfix-relay/templates/postfix.crt delete mode 100644 seed/postfix-relay/templates/postfix.key delete mode 100644 seed/postgresql-client/templates/ca_PostgreSQL.crt delete mode 100644 seed/postgresql-client/templates/postgresql.crt delete mode 100644 seed/postgresql-client/templates/postgresql.key create mode 100644 seed/postgresql-client/templates/postgresql.pass2 delete mode 100644 seed/postgresql/templates/ca_PostgreSQL.crt create mode 100644 seed/postgresql/templates/config.yml delete mode 100644 seed/postgresql/templates/postgresql.crt delete mode 100644 seed/postgresql/templates/postgresql.key rename seed/provider-systemd-machined/dictionaries/{10-machined.xml => 10_machined.xml} (100%) rename seed/provider-systemd-machined/dictionaries/{16-machined.xml => 16_machined.xml} (100%) delete mode 100644 seed/redis-client/templates/ca_Redis.crt delete mode 100644 seed/redis-client/templates/redis.crt delete mode 100644 seed/redis-client/templates/redis.key delete mode 100644 seed/redis-client/templates/redis.pem delete mode 100644 seed/redis/templates/ca_Redis.crt delete mode 100644 seed/redis/templates/redis.crt delete mode 100644 seed/redis/templates/redis.key delete mode 100644 seed/relay-mail-client/templates/ca_MailRelay.crt delete mode 100644 seed/reverse-proxy-client/templates/ca_InternalReverseProxy.crt delete mode 100644 seed/reverse-proxy-client/templates/revprox.crt delete mode 100644 seed/reverse-proxy-client/templates/revprox.key delete mode 100644 seed/roundcube/templates/ca_MailServer.crt delete mode 100644 seed/sensmotdire/README.md delete mode 100644 seed/sensmotdire/applicationservice.yml delete mode 100644 seed/sensmotdire/dictionaries/40_sensmotdire.xml delete mode 100644 seed/sensmotdire/extras/machine/20_sensmotdire.xml delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire.sh delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/about.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/accessibility.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/add_browser.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/autosuggest.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/css/sensmotdire.css delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/f0000112.html delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/faq.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/favicon.png delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/as_pointer.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/hl_corner_bl.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/hl_corner_br.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/hl_corner_tl.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/hl_corner_tr.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/sensmotdire-background-widget.png delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/sensmotdire-background.png delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/sensmotdire-logo.png delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/sensmotdire.png delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/twisty-do-down.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/twisty-do-hidden.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/twisty-down.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/twisty-hidden.gif delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/images/widget-google-shot.jpg delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/index.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/js/.htaccess delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/js/.htaccess.swp delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/js/bsn.AutoSuggest_c_2.0.js delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/js/sensmotdire.js.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/js/tabber.js delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/lang-fr.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/lib.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/plugin.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/rss20.xml delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/sensmotdire.css delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/test.php delete mode 100644 seed/sensmotdire/manual/image/postinstall/sensmotdire/widget.php delete mode 100644 seed/sensmotdire/manual/image/preinstall/sensmotdire.sh delete mode 100644 seed/sensmotdire/templates/config.php delete mode 100644 seed/sensmotdire/templates/sensmotdire.nginx.conf rename seed/{galette/extras/machine/20_sensmotdire.xml => speedtest-rs/extras/machine/20_speedtest-rs.xml} (100%) rename seed/systemd/dictionaries/{15-systemd.xml => 15_systemd.xml} (97%) create mode 100644 seed/tls/applicationservice.yml create mode 100644 seed/tls/dictionaries/26_tls.xml rename seed/{speedtest-rs/extras/machine/20-speedtest-rs.xml => tls/extras/machine/20_tls.xml} (79%) create mode 100644 seed/tls/manual/image/postinstall/autosign.py create mode 100644 seed/tls/manual/image/postinstall/letsencrypt.py create mode 100644 seed/tls/manual/image/postinstall/tls.sh create mode 100755 seed/tls/manual/image/postinstall/update-certificates create mode 100644 seed/tls/manual/image/postinstall/x509.py create mode 100644 seed/tls/manual/image/preinstall/tls.sh create mode 100644 seed/tls/templates/certificates.yml create mode 100644 seed/tls/templates/configuration.yml create mode 100644 seed/tls/templates/sysuser-tls.conf create mode 100644 seed/tls/templates/tls.service create mode 100644 seed/tls/templates/tls.timer create mode 100644 seed/tls/templates/tmpfile-tls.conf delete mode 100644 seed/znc/templates/znc.crt delete mode 100644 seed/znc/templates/znc.key diff --git a/seed/README.md b/seed/README.md index 8f7c5d85..2cac2c83 100644 --- a/seed/README.md +++ b/seed/README.md @@ -13,16 +13,13 @@ - dns: - [dns-external](dns-external/README.md): DNS client with resolution on all zones (especially outside) - [dns-local](dns-local/README.md): DNS client with access to local zones -- [dotclear](dotclear/README.md): Dotclear an open-source web publishing software - [dovecot](dovecot/README.md): Postfix and Dovecot as mail servers (Submission and IMAP) - [forgejo](forgejo/README.md): Forgejo, a community managed lightweight code hosting solution -- [galette](galette/README.md): Galette, a membership management web application towards non profit organizations - [gitea](gitea/README.md): Transitional package for Gitea to Forgejo - [host-systemd-machined](host-systemd-machined/README.md): Host with machine started in Systemd Machined environment - [imap-client](imap-client/README.md): Application service needs interact with an IMAP server - [ldap-client](ldap-client/README.md): Application service needs interact with a LDAP server - [lemonldap](lemonldap/README.md): LemonLDAP, a Web Single Sign On and Access Management -- [letsencrypt](letsencrypt/README.md): Let's encrypt, a nonprofit Certificate Authority providing TLS certificates - [mailman](mailman/README.md): GNU Mailman, managing electronic mail discussion and e-newsletter lists - mariadb: - [mariadb](mariadb/README.md): MariaDB, a relational database @@ -42,6 +39,7 @@ - [php](php/README.md): PHP, a popular general-purpose scripting language - [php-fpm](php-fpm/README.md): PHP FPM - [piwigo](piwigo/README.md): Piwigo, a photo management software +- [pki-tls](pki-tls/README.md): Autosign PKI or Let's encrypt support for TLS certificates - postfix: - [postfix-lmtp-relay](postfix-lmtp-relay/README.md): Postfix, the mail server, as LMTP relay - [postfix-relay](postfix-relay/README.md): Postfix, the mail server, as relay @@ -57,7 +55,6 @@ - [relay-mail-client](relay-mail-client/README.md): Client SMTP - [reverse-proxy-client](reverse-proxy-client/README.md): Application service needs interact with a a reverse proxy server - [roundcube](roundcube/README.md): Roundcube, a webmail -- [sensmotdire](sensmotdire/README.md): Sens Mot Dire, a french conjugaison service - [speedtest-rs](speedtest-rs/README.md): Speedtest-rs, a very lightweight Speedtest - [systemd](systemd/README.md): Systemd, a system and service manager - [unbound](unbound/README.md): Unbound, a validating, recursive, caching DNS resolver diff --git a/seed/apache/README.md b/seed/apache/README.md index 0a0093d5..f69d0a0b 100644 --- a/seed/apache/README.md +++ b/seed/apache/README.md @@ -27,8 +27,8 @@ Paramètrage avancé du serveur web Apache | Description | Help | Type | Values | |-----------------------------------------------------------------------------------------------------------------------------------|-------------------|-------------------------------------------------------------------------------------------------------------------------|----------| -| **Temps d'attente des entrées/sorties avant de considérer qu'une requête a échoué** (*[apache_timeout](dictionaries/20_web.xml)*) | Temps en secondes | [number](https://cloud.silique.fr/gitea/risotto/rougail/src/branch/main/doc/variable/README.md#le-type-de-la-variable) | 300 | -| **Autoriser les connexions persistantes** (*[apache_keepalive](dictionaries/20_web.xml)*) | | [boolean](https://cloud.silique.fr/gitea/risotto/rougail/src/branch/main/doc/variable/README.md#le-type-de-la-variable) | True | +| **Temps d'attente des entrées/sorties avant de considérer qu'une requête a échoué** (*[apache_timeout](dictionaries/20_web.xml)*) | Temps en secondes | [number](https://forge.cloud.silique.fr/risotto/rougail/src/branch/main/doc/variable/README.md#le-type-de-la-variable) | 300 | +| **Autoriser les connexions persistantes** (*[apache_keepalive](dictionaries/20_web.xml)*) | | [boolean](https://forge.cloud.silique.fr/risotto/rougail/src/branch/main/doc/variable/README.md#le-type-de-la-variable) | True | - [+]: variable is multiple diff --git a/seed/apache/dictionaries/20_web.xml b/seed/apache/dictionaries/20_web.xml index 1cdf9127..afd56df9 100644 --- a/seed/apache/dictionaries/20_web.xml +++ b/seed/apache/dictionaries/20_web.xml @@ -5,9 +5,6 @@ /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/risotto.conf /etc/httpd/conf.d/ssl.conf - /etc/httpd/ssl/server.ca - /etc/httpd/ssl/server.crt - /etc/httpd/ssl/server.key /sysusers.d/httpd.conf /tmpfiles.d/0httpd.conf diff --git a/seed/apache/manual/image/preinstall/apache.sh b/seed/apache/manual/image/preinstall/apache.sh index c8ac0407..9c9e8c36 100644 --- a/seed/apache/manual/image/preinstall/apache.sh +++ b/seed/apache/manual/image/preinstall/apache.sh @@ -1 +1 @@ -PKG="$PKG mod_ssl" +PKG="$PKG httpd mod_ssl" diff --git a/seed/apache/templates/server.ca b/seed/apache/templates/server.ca deleted file mode 100644 index 91ed66dd..00000000 --- a/seed/apache/templates/server.ca +++ /dev/null @@ -1 +0,0 @@ -%%get_chain(%%domain_name_eth0, authority_cn=%%revprox_client_server_domainname, authority_name="InternalReverseProxy", hide=%%hide_secret) diff --git a/seed/apache/templates/server.crt b/seed/apache/templates/server.crt deleted file mode 100644 index da844246..00000000 --- a/seed/apache/templates/server.crt +++ /dev/null @@ -1 +0,0 @@ -%%get_certificate(%%domain_name_eth0, authority_cn=%%revprox_client_server_domainname, authority_name="InternalReverseProxy", hide=%%hide_secret) diff --git a/seed/apache/templates/server.key b/seed/apache/templates/server.key deleted file mode 100644 index e8593618..00000000 --- a/seed/apache/templates/server.key +++ /dev/null @@ -1 +0,0 @@ -%%get_private_key(%%domain_name_eth0, authority_cn=%%revprox_client_server_domainname, authority_name="InternalReverseProxy", hide=%%hide_secret) diff --git a/seed/apache/templates/ssl.conf b/seed/apache/templates/ssl.conf index 0067b4a1..d2ee87c5 100644 --- a/seed/apache/templates/ssl.conf +++ b/seed/apache/templates/ssl.conf @@ -100,7 +100,7 @@ SSLProxyCipherSuite PROFILE=SYSTEM # require an ECC certificate which can also be configured in # parallel. # GNUNUX SSLCertificateFile /etc/pki/tls/certs/localhost.crt -SSLCertificateFile /etc/httpd/ssl/server.crt +SSLCertificateFile %%tls_cert_directory/revprox.crt # Server Private Key: # If the key is not combined with the certificate, use this @@ -109,7 +109,7 @@ SSLCertificateFile /etc/httpd/ssl/server.crt # both in parallel (to also allow the use of DSA ciphers, etc.) # ECC keys, when in use, can also be configured in parallel # GNUNUX SSLCertificateKeyFile /etc/pki/tls/private/localhost.key -SSLCertificateKeyFile /etc/httpd/ssl/server.key +SSLCertificateKeyFile %%tls_key_directory/revprox.key # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the @@ -126,7 +126,7 @@ SSLCertificateKeyFile /etc/httpd/ssl/server.key # huge file containing all of them (file must be PEM encoded) #SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt #>GNUNUX -SSLCACertificateFile /etc/httpd/ssl/server.ca +SSLCACertificateFile %%tls_ca_directory/InternalReverseProxy.crt # - domain_name_eth0 + server_name machine.name diff --git a/seed/base-machine/funcs/funcs.py b/seed/base-machine/funcs/funcs.py index 1784d5a3..54fe475c 100644 --- a/seed/base-machine/funcs/funcs.py +++ b/seed/base-machine/funcs/funcs.py @@ -10,11 +10,11 @@ _HERE = _environ['PWD'] _PASSWORD_DIR = _join(_HERE, 'password') -def get_password(server_name: str, - username: str, +def get_password(username: str, description: str, type: str, hide: bool, + server_name: str='none', length: int=20, temporary: bool=True, ) -> str: diff --git a/seed/base/dictionaries/00-base.xml b/seed/base/dictionaries/00_base.xml similarity index 100% rename from seed/base/dictionaries/00-base.xml rename to seed/base/dictionaries/00_base.xml diff --git a/seed/base/funcs/base.py b/seed/base/funcs/base.py index c4fe7125..3017cd1c 100644 --- a/seed/base/funcs/base.py +++ b/seed/base/funcs/base.py @@ -21,12 +21,15 @@ def get_ip(zones: dict, break else: raise ValueError(f'cannot find IP in domain name "{domain_name}" (for "{s_name}")') + if not host_name in zone['hosts']: + continue ret = zone['hosts'][host_name] if not return_list: return ret if ret not in lst: lst.append(ret) - return lst + if return_list: + return lst @_multi_function diff --git a/seed/dns-external/README.md b/seed/dns-external/README.md index 2db1e1b2..7a82a85e 100644 --- a/seed/dns-external/README.md +++ b/seed/dns-external/README.md @@ -19,8 +19,8 @@ DNS client with resolution on all zones (especially outside). | Description | Values | Supplier | |-------------------------------------------------------------|----------|-------------| -| *[**dns_is_only_local**](dictionaries/14-dns-external.xml)* | False | | -| *[dns_client_address](dictionaries/14-dns-external.xml)* | | ExternalDNS | +| *[**dns_is_only_local**](dictionaries/14_dns-external.xml)* | False | | +| *[dns_client_address](dictionaries/14_dns-external.xml)* | | ExternalDNS | - [+]: variable is multiple diff --git a/seed/dns-external/dictionaries/14-dns-external.xml b/seed/dns-external/dictionaries/14_dns-external.xml similarity index 100% rename from seed/dns-external/dictionaries/14-dns-external.xml rename to seed/dns-external/dictionaries/14_dns-external.xml diff --git a/seed/dns-local/dictionaries/13-dns-local.xml b/seed/dns-local/dictionaries/13_dns-local.xml similarity index 100% rename from seed/dns-local/dictionaries/13-dns-local.xml rename to seed/dns-local/dictionaries/13_dns-local.xml diff --git a/seed/dotclear/README.md b/seed/dotclear/README.md deleted file mode 100644 index dccce365..00000000 --- a/seed/dotclear/README.md +++ /dev/null @@ -1,43 +0,0 @@ ---- -gitea: none -include_toc: true ---- - -# dotclear - -[All applications services for this dataset.](../README.md) - -## Description - -Dotclear an open-source web publishing software. - -[For more informations](https://dotclear.org) - -## Dependances - -- [base-fedora-36](../base-fedora-36/README.md) - - [base-fedora](../base-fedora/README.md) - - [systemd](../systemd/README.md) - - [base-machine](../base-machine/README.md) - - [base](../base/README.md) - - [dns-local](../dns-local/README.md) -- [postgresql-client](../postgresql-client/README.md) -- [nginx-https](../nginx-https/README.md) - - [nginx-common](../nginx-common/README.md) - - [reverse-proxy-client](../reverse-proxy-client/README.md) -- [php-fpm](../php-fpm/README.md) - - [php](../php/README.md) - -## Variables - -### Général (*general*) - -#### Dotclear (*general.dotclear*) - -| Description | Type | -|----------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| -| **Adresse courriel de l'administrateur** (*[admin_mail_from](dictionaries/40_dotclear.xml)*) | [mail](https://cloud.silique.fr/gitea/risotto/rougail/src/branch/main/doc/variable/README.md#le-type-de-la-variable) | - - -- [+]: variable is multiple -- **bold**: variable is mandatory diff --git a/seed/dotclear/applicationservice.yml b/seed/dotclear/applicationservice.yml deleted file mode 100644 index 33dd1403..00000000 --- a/seed/dotclear/applicationservice.yml +++ /dev/null @@ -1,8 +0,0 @@ -format: '0.1' -description: Dotclear an open-source web publishing software -website: https://dotclear.org -depends: - - base-fedora-36 - - postgresql-client - - nginx-https - - php-fpm diff --git a/seed/dotclear/dictionaries/40_dotclear.xml b/seed/dotclear/dictionaries/40_dotclear.xml deleted file mode 100644 index 924fc9b4..00000000 --- a/seed/dotclear/dictionaries/40_dotclear.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - /etc/dotclear/config.php - /etc/nginx/default.d/dotclear.conf - /tmpfiles.d/0dotclear.conf - - - - - - - - - - domain_name_eth0 - secret_key - dotclear - cleartext - hide_secret - dotclear_secret_key - - - diff --git a/seed/dotclear/manual/image/postinstall/dotclear.sh b/seed/dotclear/manual/image/postinstall/dotclear.sh deleted file mode 100644 index 3beb06fd..00000000 --- a/seed/dotclear/manual/image/postinstall/dotclear.sh +++ /dev/null @@ -1,16 +0,0 @@ -set -e - -ORIPWD=$PWD -mkdir -p "$IMAGE_NAME_RISOTTO_IMAGE_DIR_TMP/usr/local/share" -cd "$IMAGE_NAME_RISOTTO_IMAGE_DIR_TMP/usr/local/share" -wget -q "https://download.dotclear.net/latest.tar.gz" -tar xf *tar.gz -rm -f *tar.gz -chown -R root: dotclear -cd dotclear -rmdir public -ln -s /srv/dotclear/public public -cd inc -ln -s /etc/dotclear/config.php config.php - -cd $ORIPWD diff --git a/seed/dotclear/manual/image/preinstall/dotclear.sh b/seed/dotclear/manual/image/preinstall/dotclear.sh deleted file mode 100644 index c29a6cdc..00000000 --- a/seed/dotclear/manual/image/preinstall/dotclear.sh +++ /dev/null @@ -1 +0,0 @@ -PKG="$PKG php-pgsql php-mbstring php-xml" diff --git a/seed/dotclear/templates/config.php b/seed/dotclear/templates/config.php deleted file mode 100644 index 1380766a..00000000 --- a/seed/dotclear/templates/config.php +++ /dev/null @@ -1,108 +0,0 @@ -GNUNUX -//define('DC_TPL_CACHE', path::real(__DIR__ . '/..') . '/cache'); -define('DC_TPL_CACHE', '/srv/dotclear/cache'); -//GNUNUX -define('DC_NOT_UPDATE', false); -//GNUNUX -define('DC_REVERSE_PROXY',true); -//