From 07f0869b3b5edaee1641781bb80018f05ce1afdb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Mon, 7 Mar 2022 16:04:12 +0100 Subject: [PATCH] Updated ws.pm (converted to the new c3d format). --- .../firstboot/scripts}/01_setupnetworking.sh | 44 +++++++++++------- .../firstboot/scripts}/02_settimezone.sh | 0 .../firstboot/scripts/03_setupfds.sh} | 2 +- .../firstboot/scripts/10_setupletsencrypt.sh | 4 ++ .../c3d/firstboot/scripts/20_setuphttpd.sh | 17 +++++++ .../firstboot/scripts/90_setupservices.sh} | 4 +- sources/ws.pm/c3d/mode.txt | 4 ++ .../etc/httpd/conf.d/useribm.hu.443.conf.le | 0 .../etc/httpd/conf.d/useribm.hu.80.conf | 0 .../conf.d/userrendszerhaz.hu.443.conf.le | 0 .../httpd/conf.d/userrendszerhaz.hu.80.conf | 0 .../usr/local/bin/getletsencrypt.sh | 19 ++++++++ .../postinstall/scripts/10_setupservices.sh | 7 +++ sources/ws.pm/envvars | 5 +- sources/ws.pm/firstboot/10_certbot.sh | 46 ------------------- sources/ws.pm/firstboot/11_setuppostfix.sh | 7 --- sources/ws.pm/firstboot/99_cleanup.sh | 6 --- sources/ws.pm/postinstall/01_setownership.sh | 10 ---- .../ws.pm/postinstall/02_setpermissions.sh | 9 ---- sources/ws.pm/postinstall/03_installfiles.sh | 16 ------- sources/ws.pm/postinstall/99_cleanup.sh | 6 --- .../install/etc/ssh/ssh_host_ecdsa_key | 8 ---- .../install/etc/ssh/ssh_host_ecdsa_key.pub | 1 - .../install/etc/ssh/ssh_host_ed25519_key | 7 --- .../etc/ssh/ssh_host_ed25519_key-cert.pub | 1 - .../install/etc/ssh/ssh_host_ed25519_key.pub | 1 - .../install/etc/ssh/ssh_host_rsa_key | 38 --------------- .../install/etc/ssh/ssh_host_rsa_key.pub | 1 - .../etc/ssh/sshd_config.d/99-host-cert.conf | 1 - .../etc/ssh/sshd_config.d/99-user-CA.conf | 1 - .../install/etc/ssh/trusted-user-ca.keys | 1 - 31 files changed, 83 insertions(+), 183 deletions(-) rename sources/ws.pm/{firstboot => c3d/firstboot/scripts}/01_setupnetworking.sh (63%) rename sources/ws.pm/{firstboot => c3d/firstboot/scripts}/02_settimezone.sh (100%) rename sources/ws.pm/{firstboot/03_setupldap.sh => c3d/firstboot/scripts/03_setupfds.sh} (80%) create mode 100755 sources/ws.pm/c3d/firstboot/scripts/10_setupletsencrypt.sh create mode 100755 sources/ws.pm/c3d/firstboot/scripts/20_setuphttpd.sh rename sources/ws.pm/{postinstall/10_setupservices.sh => c3d/firstboot/scripts/90_setupservices.sh} (54%) create mode 100644 sources/ws.pm/c3d/mode.txt rename sources/ws.pm/{postinstall/install => c3d/postinstall/install-data}/etc/httpd/conf.d/useribm.hu.443.conf.le (100%) rename sources/ws.pm/{postinstall/install => c3d/postinstall/install-data}/etc/httpd/conf.d/useribm.hu.80.conf (100%) rename sources/ws.pm/{postinstall/install => c3d/postinstall/install-data}/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le (100%) rename sources/ws.pm/{postinstall/install => c3d/postinstall/install-data}/etc/httpd/conf.d/userrendszerhaz.hu.80.conf (100%) create mode 100755 sources/ws.pm/c3d/postinstall/install-data/usr/local/bin/getletsencrypt.sh create mode 100755 sources/ws.pm/c3d/postinstall/scripts/10_setupservices.sh delete mode 100755 sources/ws.pm/firstboot/10_certbot.sh delete mode 100755 sources/ws.pm/firstboot/11_setuppostfix.sh delete mode 100755 sources/ws.pm/firstboot/99_cleanup.sh delete mode 100755 sources/ws.pm/postinstall/01_setownership.sh delete mode 100755 sources/ws.pm/postinstall/02_setpermissions.sh delete mode 100755 sources/ws.pm/postinstall/03_installfiles.sh delete mode 100755 sources/ws.pm/postinstall/99_cleanup.sh delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key.pub delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key-cert.pub delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key.pub delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key.pub delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-host-cert.conf delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-user-CA.conf delete mode 100644 sources/ws.pm/postinstall/install/etc/ssh/trusted-user-ca.keys diff --git a/sources/ws.pm/firstboot/01_setupnetworking.sh b/sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh similarity index 63% rename from sources/ws.pm/firstboot/01_setupnetworking.sh rename to sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh index b03ad51..1fc0f53 100755 --- a/sources/ws.pm/firstboot/01_setupnetworking.sh +++ b/sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh @@ -4,34 +4,46 @@ sleep 1 systemctl --quiet is-active NetworkManager.service NM_RC=$? -WAITED=0 +CYCLES_WAITED=0 while [ $NM_RC -ne 0 ] do + if [ $CYCLES_WAITED -ge 10 ] + then + exit 1 + fi echo -n . sleep 1 - WAITED=1 + CYCLES_WAITED=$(( $CYCLES_WAITED + 1 )) systemctl --quiet is-active NetworkManager.service NM_RC=$? done -[ $WAITED -eq 1 ] && echo +[ $CYCLES_WAITED -gt 0 ] && echo -CONNECTIONS=$(nmcli --terse connection show | wc -l) -while [ $CONNECTIONS -ne 1 ] +# wait for one/the network connection to come up +CONNECTION_DEVICES_UP=$(nmcli --terse connection show \ + | grep --invert-match ':$' | wc -l) +CYCLES_WAITED=0 +while [ $CONNECTION_DEVICES_UP -lt 1 ] do - echo "Number of connections: $CONNECTIONS" >&2 + if [ $CYCLES_WAITED -ge 10 ] + then + nmcli connection show + exit 1 + fi + echo -n . sleep 1 - CONNECTIONS=$(nmcli --terse connection show | wc -l) + CYCLES_WAITED=$(( $CYCLES_WAITED + 1 )) + CONNECTION_DEVICES_UP=$(nmcli --terse connection show \ + | grep --invert-match ':$' | wc -l) done +[ $CYCLES_WAITED -gt 0 ] && echo -nmcli --terse connection show | grep ':$' >/dev/null -ALL_CONNECTION_DEVICES_KNOWN=$? -while [ $ALL_CONNECTION_DEVICES_KNOWN -eq 0 ] -do - echo "Not all connection devices are known yet" >&2 - sleep 1 - nmcli --terse connection show | grep ':$' >/dev/null - ALL_CONNECTION_DEVICES_KNOWN=$? -done +CONNECTIONS=$(nmcli --terse connection show | wc -l) +if [ $CONNECTIONS -ne 1 ] +then + echo "Number of connections: $CONNECTIONS" >&2 + exit 1 +fi CONNECTION_LINE=$(nmcli --terse connection show) CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':') diff --git a/sources/ws.pm/firstboot/02_settimezone.sh b/sources/ws.pm/c3d/firstboot/scripts/02_settimezone.sh similarity index 100% rename from sources/ws.pm/firstboot/02_settimezone.sh rename to sources/ws.pm/c3d/firstboot/scripts/02_settimezone.sh diff --git a/sources/ws.pm/firstboot/03_setupldap.sh b/sources/ws.pm/c3d/firstboot/scripts/03_setupfds.sh similarity index 80% rename from sources/ws.pm/firstboot/03_setupldap.sh rename to sources/ws.pm/c3d/firstboot/scripts/03_setupfds.sh index 415d6db..e9937e7 100755 --- a/sources/ws.pm/firstboot/03_setupldap.sh +++ b/sources/ws.pm/c3d/firstboot/scripts/03_setupfds.sh @@ -6,5 +6,5 @@ authselect select sssd with-mkhomedir --force cat >>/etc/openldap/ldap.conf <>/etc/postfix/main.cf - -systemctl enable postfix.service -systemctl start postfix.service diff --git a/sources/ws.pm/firstboot/99_cleanup.sh b/sources/ws.pm/firstboot/99_cleanup.sh deleted file mode 100755 index b87f2f4..0000000 --- a/sources/ws.pm/firstboot/99_cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - - -REAL_PATH=$(dirname $(realpath $0)) - -echo rm -Rf $REAL_PATH diff --git a/sources/ws.pm/postinstall/01_setownership.sh b/sources/ws.pm/postinstall/01_setownership.sh deleted file mode 100755 index 5582786..0000000 --- a/sources/ws.pm/postinstall/01_setownership.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - - -REAL_PATH=$(dirname $(realpath $0)) -SOURCE_PATH=$REAL_PATH/install - - -chown -R root.root $SOURCE_PATH/* - -chgrp ssh_keys $SOURCE_PATH/etc/ssh/*_key diff --git a/sources/ws.pm/postinstall/02_setpermissions.sh b/sources/ws.pm/postinstall/02_setpermissions.sh deleted file mode 100755 index 8066ca2..0000000 --- a/sources/ws.pm/postinstall/02_setpermissions.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - - -REAL_PATH=$(dirname $(realpath $0)) -SOURCE_PATH=$REAL_PATH/install - - -chmod 400 $SOURCE_PATH/etc/ssh/*_key -chmod 444 $SOURCE_PATH/etc/ssh/*.pub diff --git a/sources/ws.pm/postinstall/03_installfiles.sh b/sources/ws.pm/postinstall/03_installfiles.sh deleted file mode 100755 index e4ee7ff..0000000 --- a/sources/ws.pm/postinstall/03_installfiles.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - - -REAL_PATH=$(dirname $(realpath $0)) - -tar --create \ - --directory=$REAL_PATH \ - --exclude=.placeholder \ - --to-stdout \ - install \ - | tar --extract \ - --backup \ - --directory=/ \ - --no-overwrite-dir \ - --strip-components=1 \ - --suffix=.orig diff --git a/sources/ws.pm/postinstall/99_cleanup.sh b/sources/ws.pm/postinstall/99_cleanup.sh deleted file mode 100755 index b87f2f4..0000000 --- a/sources/ws.pm/postinstall/99_cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - - -REAL_PATH=$(dirname $(realpath $0)) - -echo rm -Rf $REAL_PATH diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key deleted file mode 100644 index a620b3d..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS -1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQRV9gPUp7JtrYKTmjnCfenOtimEhmj6 -zY6k631As6vvCH6QpLU3qxoPs+kdRbWD9gXhQDimJGZLnlIY8FeHFyfqAAAAoEJDyclCQ8 -nJAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFX2A9Snsm2tgpOa -OcJ96c62KYSGaPrNjqTrfUCzq+8IfpCktTerGg+z6R1FtYP2BeFAOKYkZkueUhjwV4cXJ+ -oAAAAhAOPPGAEPClQE2nh3ba2NW2YBKHcYARhbYKADtnufmOe+AAAAAAECAwQFBgc= ------END OPENSSH PRIVATE KEY----- diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key.pub b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key.pub deleted file mode 100644 index 16d3e2f..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ecdsa_key.pub +++ /dev/null @@ -1 +0,0 @@ -ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFX2A9Snsm2tgpOaOcJ96c62KYSGaPrNjqTrfUCzq+8IfpCktTerGg+z6R1FtYP2BeFAOKYkZkueUhjwV4cXJ+o= diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key deleted file mode 100644 index 8eeb826..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACDDnEGt+oDQ21ShuMBtp9pF6c/KbuGkyi7G87RC7sH0gwAAAIgsZ2UFLGdl -BQAAAAtzc2gtZWQyNTUxOQAAACDDnEGt+oDQ21ShuMBtp9pF6c/KbuGkyi7G87RC7sH0gw -AAAEBmAugNoMxjQJkGGyCIGFPE2NorShm1gcLuD1C0HnMzr8OcQa36gNDbVKG4wG2n2kXp -z8pu4aTKLsbztELuwfSDAAAAAAECAwQF ------END OPENSSH PRIVATE KEY----- diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key-cert.pub b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key-cert.pub deleted file mode 100644 index 619d992..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key-cert.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIFw20kXef4L7ZnrOqpbiBBSICKjbF4BGUsSjjzTVxnhuAAAAIMOcQa36gNDbVKG4wG2n2kXpz8pu4aTKLsbztELuwfSDAAAAAAAAAAAAAAACAAAAEHdzLnBtLnVzZXJpYm0uaHUAAAAUAAAAEHdzLnBtLnVzZXJpYm0uaHUAAAAAAAAAAP//////////AAAAAAAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACBF2CCM61EsfPwUOv7bZEq+aBMgeReWIOG6dQzpKgzjfQAAAFMAAAALc3NoLWVkMjU1MTkAAABABvS4I9z4yPUIdwPZeTK36B5S/yh16ccUBwPQdFbEkH+53OWETlsyL5EKiMEWZz90e1PRJSk83Reqv8JypGqjAA== /etc/ssh/ssh_host_ed25519_key.pub diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key.pub b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key.pub deleted file mode 100644 index b713ff6..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_ed25519_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOcQa36gNDbVKG4wG2n2kXpz8pu4aTKLsbztELuwfSD diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key deleted file mode 100644 index fde5d4a..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key +++ /dev/null @@ -1,38 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn -NhAAAAAwEAAQAAAYEA2ZPCbpjTcIiERs2K8B0W9rMh/RoxzbUlvz2KPiNGuKkEx5aWtSzs -KGXJj68xeFBILDeWloIHAbB2x9CflxD04BYdq3KdUWe/YjwrPrrXy/VjT4yWZO+fEcz6G/ -vLGzRq+5rNHZ8k5JYWjh0pBKchKGbPVOnP6PmkgFPJDGlrsBFtEWxaiucvYEn3hmqd0xKB -Tb+aKL31vfGLzo94RoLrXpdc/nBz/Y9AYmD241pUp42TD2WvryhsF9XSreOMtAKkkj0R/j -kJoYA8o4PwacrOwBZhyylTgZPUG3vUjG3R+fnegGDfLtJ+RmTOUZdpISBvFlVCyBG/U8C/ -pY0pqBTT7y2/EsGuuS34btHCsYrsUhyMcu6puP87fronqe/Q/01I9OsdxLLBz3eVZAUV3Q -tSruojVlkf33GUqMW7ZR6RNDbfgjmFaEENcJqfLagq4PuP1BFvPtDZsQ8pha1/wgE01jTY -+T/SK8ShuR57XfbdjkJUVZ43VDKhLeZnq07DnLdPAAAFeEIvzCZCL8wmAAAAB3NzaC1yc2 -EAAAGBANmTwm6Y03CIhEbNivAdFvazIf0aMc21Jb89ij4jRripBMeWlrUs7ChlyY+vMXhQ -SCw3lpaCBwGwdsfQn5cQ9OAWHatynVFnv2I8Kz6618v1Y0+MlmTvnxHM+hv7yxs0avuazR -2fJOSWFo4dKQSnIShmz1Tpz+j5pIBTyQxpa7ARbRFsWornL2BJ94ZqndMSgU2/mii99b3x -i86PeEaC616XXP5wc/2PQGJg9uNaVKeNkw9lr68obBfV0q3jjLQCpJI9Ef45CaGAPKOD8G -nKzsAWYcspU4GT1Bt71Ixt0fn53oBg3y7SfkZkzlGXaSEgbxZVQsgRv1PAv6WNKagU0+8t -vxLBrrkt+G7RwrGK7FIcjHLuqbj/O366J6nv0P9NSPTrHcSywc93lWQFFd0LUq7qI1ZZH9 -9xlKjFu2UekTQ234I5hWhBDXCany2oKuD7j9QRbz7Q2bEPKYWtf8IBNNY02Pk/0ivEobke -e1323Y5CVFWeN1QyoS3mZ6tOw5y3TwAAAAMBAAEAAAGANfY9nKxulFRnaiAEO3Ubguf+oA -VlIL2ytPGQXcTl/1p8AvxIOHsBvysviGFNBafznnPS91UcY8DeVMRbMF5WPVV+2ky807nF -b5m4qAAzETS1Ar+9dR8w9ns99L7IKuEfP3OvN4+G2OKYiXqV979zq8+D0G2E0SVJNUKSdG -+Y87v+rvmOozCfQWRW7ZF3vyexxhSlKUGjtw43PG28yNAji/xCZiCBw/tJXpzp3o1CvaOR -O5perjR6SpcPf20WMncM4ImDLBTIBYQBpCoQp+8CJ4owic7HJO9nu3oF0tTBP6TnHNAhJG -JTQQIb1M6BqBKjG1PHpeQtjcxV3/hkuisHzxUVjh/GRFK+g/vaxCz5z0IkUGTZLyXLgVFl -81cvY/eB2H2nZia4Mn8AAcjZLxm0oEN1CbaEyoUSgtzLILfkwv8XUxTQh+Il8s9fcvxowg -MVnBES+O43YjmWc9T7RbwJKsKjKal8dMeHopC/2H9uCuYCbjNCKbymb+bkLjGHLlMxAAAA -wQC1DqpGYalTGMCJHCcYJ9QYTuiXz7Wb5ZuLkQVhe1VUHY+0OKcK98vgUCqJJsFZaiBRJs -MpU9vQPyuMb16epGZbOIf86EsLp1OvExlZh3UYDrsPaGSzd+H73L0Oypg/VEaxD5BnCIRi -bgGaa27KhGVaN9YX/TE8rpTwdwBaSc+3pJMyhcu2be2RuCIGZssQXVbWxAijbsQDNODzrE -SPmiqK9DAoQJdCen9Y2K1mYELe+uRvpxOWWt5Og77dEN4T2b0AAADBAP5/e2ByNagJxVE3 -VOWE7GZIHbiKzPPGgFaaZTVsFZYzKmQ3Bom7I+r30rXk3X6I3oPimJAH65PtY5IyXMFWb0 -T3Ys5LzM66iOw/2rCXuQWmOFFyvnqZqsFeKcaNNDfm+uvm45JDZf1OpnmbJoi2XHB4XkIb -pcJai6KR2pz9j2MLU3oX8Do34gAtL7OAjQ9saEVKBQDhUaVxzQsyhzVtSazVttDPscgPj7 -GaR+BJ/YVm//5NgNxNtJc9+PHEY1buFQAAAMEA2tx+jogMCihD2Q+EJM1NEF+7PK6zmnTV -WI5hb1jdDITbVPhEHVW6gWSnVNlId9eN1QZaTwk8xT7PpOFTXaDYvYoLs/sW7b4TxU//H8 -rhdUlyrWNzOqIA5LhUYBtpOhOm5YYigxq+jdljU7xzEB7ZbAYFAWkAgexmS+xHYn55wTvD -sH8EhWfslOpEAGjjbUQQi23gNYm3+zgsOsvgeM6GmeyJsYwImlQTWdHXjfDP3rWCM6F5Dy -z2OALeF2o5d4zTAAAAAAEC ------END OPENSSH PRIVATE KEY----- diff --git a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key.pub b/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key.pub deleted file mode 100644 index 3d979fc..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/ssh_host_rsa_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZk8JumNNwiIRGzYrwHRb2syH9GjHNtSW/PYo+I0a4qQTHlpa1LOwoZcmPrzF4UEgsN5aWggcBsHbH0J+XEPTgFh2rcp1RZ79iPCs+utfL9WNPjJZk758RzPob+8sbNGr7ms0dnyTklhaOHSkEpyEoZs9U6c/o+aSAU8kMaWuwEW0RbFqK5y9gSfeGap3TEoFNv5oovfW98YvOj3hGgutel1z+cHP9j0BiYPbjWlSnjZMPZa+vKGwX1dKt44y0AqSSPRH+OQmhgDyjg/Bpys7AFmHLKVOBk9Qbe9SMbdH5+d6AYN8u0n5GZM5Rl2khIG8WVULIEb9TwL+ljSmoFNPvLb8Swa65Lfhu0cKxiuxSHIxy7qm4/zt+uiep79D/TUj06x3EssHPd5VkBRXdC1Ku6iNWWR/fcZSoxbtlHpE0Nt+COYVoQQ1wmp8tqCrg+4/UEW8+0NmxDymFrX/CATTWNNj5P9IrxKG5Hntd9t2OQlRVnjdUMqEt5merTsOct08= diff --git a/sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-host-cert.conf b/sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-host-cert.conf deleted file mode 100644 index 173b545..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-host-cert.conf +++ /dev/null @@ -1 +0,0 @@ -HostCertificate /etc/ssh/ssh_host_ed25519_key-cert.pub diff --git a/sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-user-CA.conf b/sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-user-CA.conf deleted file mode 100644 index 115882b..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/sshd_config.d/99-user-CA.conf +++ /dev/null @@ -1 +0,0 @@ -TrustedUserCAKeys /etc/ssh/trusted-user-ca.keys diff --git a/sources/ws.pm/postinstall/install/etc/ssh/trusted-user-ca.keys b/sources/ws.pm/postinstall/install/etc/ssh/trusted-user-ca.keys deleted file mode 100644 index 84d19e3..0000000 --- a/sources/ws.pm/postinstall/install/etc/ssh/trusted-user-ca.keys +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICcf/XXU8dNVtbveGmwbdnRJfYIItzxKmgRkzlp0k6r5 user-CA -- 2.54.0