bugfix

outdoorbits · Oct 11, 2024 · 6d53993 · 6d53993
1 parent eeec588
commit 6d53993
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/etc_apache2_sites-available_comitup.conf b/etc_apache2_sites-available_comitup.conf
@@ -2,7 +2,7 @@
 	SSLEngine on
 
 	SSLCertificateFile /etc/ssl/certs/little-backup-box.crt
-	SSLCertificateKeyFile /etc/ssl/certs/little-backup-box.key
+	SSLCertificateKeyFile /etc/ssl/private/little-backup-box.key
 
 	ProxyPreserveHost Off
 	ProxyRequests Off

diff --git a/etc_apache2_sites-available_little-backup-box.conf b/etc_apache2_sites-available_little-backup-box.conf
@@ -52,7 +52,7 @@
 		SSLEngine on
 
 		SSLCertificateFile /etc/ssl/certs/little-backup-box.crt
-		SSLCertificateKeyFile /etc/ssl/certs/little-backup-box.key
+		SSLCertificateKeyFile /etc/ssl/private/little-backup-box.key
 
 		<FilesMatch "\.(cgi|shtml|phtml|php)$">
 			SSLOptions +StdEnvVars
@@ -96,7 +96,7 @@
 		SSLProxyEngine On
 
 		SSLCertificateFile /etc/ssl/certs/little-backup-box.crt
-		SSLCertificateKeyFile /etc/ssl/certs/little-backup-box.key
+		SSLCertificateKeyFile /etc/ssl/private/little-backup-box.key
 
 		ProxyPreserveHost Off
 		ProxyRequests Off

diff --git a/etc_vsftpd.conf b/etc_vsftpd.conf
@@ -13,6 +13,6 @@ connect_from_port_20=YES
 idle_session_timeout=600
 data_connection_timeout=120
 pam_service_name=vsftpd
-rsa_cert_file=/etc/ssl/certs/little-backup-box.pem
-rsa_private_key_file=/etc/ssl/certs/little-backup-box.key
+rsa_cert_file=/etc/ssl/private/little-backup-box.pem
+rsa_private_key_file=/etc/ssl/private/little-backup-box.key
 ssl_enable=YES
diff --git a/install-little-backup-box.sh b/install-little-backup-box.sh
@@ -514,10 +514,12 @@ WantedBy=multi-user.target" | tee /etc/systemd/system/multi-user.target.wants/ph
 sudo systemctl daemon-reload
 
 #openssl
-sudo openssl req -x509 -nodes -days 3650 -subj '/C=OW/ST=MilkyWay/L=Earth/O=little-backup-box/CN=10.42.0.1' -newkey rsa:2048 -keyout /etc/ssl/certs/little-backup-box.key -out /etc/ssl/certs/little-backup-box.crt
-sudo cat /etc/ssl/certs/little-backup-box.key | sudo tee /etc/ssl/certs/little-backup-box.pem
-sudo cat /etc/ssl/certs/little-backup-box.crt | sudo tee -a /etc/ssl/certs/little-backup-box.pem
-sudo chmod 600 /etc/ssl/certs/little-backup-box.*
+sudo openssl req -x509 -nodes -days 3650 -subj '/C=OW/ST=MilkyWay/L=Earth/O=little-backup-box/CN=10.42.0.1' -newkey rsa:2048 -keyout /etc/ssl/private/little-backup-box.key -out /etc/ssl/certs/little-backup-box.crt
+sudo cat /etc/ssl/private/little-backup-box.key | sudo tee /etc/ssl/private/little-backup-box.pem
+sudo cat /etc/ssl/certs/little-backup-box.crt | sudo tee -a /etc/ssl/private/little-backup-box.pem
+sudo chmod 600 /etc/ssl/private/little-backup-box.key
+sudo chmod 600 /etc/ssl/private/little-backup-box.pem
+sudo chmod 600 /etc/ssl/certs/little-backup-box.crt
 
  # Apache-config-files
 if [ "${SCRIPT_MODE}" = "install" ]; then