Преглед изворни кода

Move v-update-letsencrypt-ssl cron to /var/spool/cron (#4823)

* Move v-update-letsencrypt-ssl cron to  /var/spool/cron

Instead /etc/cron.d/hestiaweb

* Use correct file

* Make suggested changes

* Update 1.9.3.sh

Make some extra changes
Jaap Marcus пре 1 година
родитељ
комит
8b3e951d14
2 измењених фајлова са 14 додато и 2 уклоњено
  1. 2 2
      bin/v-add-letsencrypt-domain
  2. 12 0
      install/upgrade/versions/1.9.3.sh

+ 2 - 2
bin/v-add-letsencrypt-domain

@@ -580,10 +580,10 @@ if [ "$?" -ne '0' ]; then
 fi
 
 # Adding LE autorenew cronjob
-if [ -z "$(grep v-update-letsen "/etc/cron.d/hestiaweb")" ]; then
+if [ -z "$(grep $BIN/v-update-letsencrypt "/var/spool/cron/crontabs/hestiaweb")" ]; then
 	min=$(generate_password '012345' '2')
 	hour=$(generate_password '1234567' '1')
-	echo "$min $hour * * * sudo /usr/local/hestia/bin/v-update-letsencrypt-ssl" > /etc/cron.d/hestiaweb
+	sed -i -e "\$a*/5 * * * * sudo $BIN/v-update-letsencrypt" "/var/spool/cron/crontabs/hestiaweb"
 fi
 
 # Updating letsencrypt key

+ 12 - 0
install/upgrade/versions/1.9.3.sh

@@ -32,3 +32,15 @@ if [ -x /usr/sbin/jailbash ]; then
 	$HESTIA/bin/v-delete-sys-ssh-jail
 	$HESTIA/bin/v-add-sys-ssh-jail
 fi
+
+# Check if file exists
+if [ -f "/etc/cron.d/hestiaweb" ]; then
+	# Just remove it
+	rm -f /etc/cron.d/hestiaweb
+	# Check if not duplicate
+	if [ -z "$(grep $BIN/v-update-letsencrypt "/var/spool/cron/crontabs/hestiaweb")" ]; then
+		min=$(generate_password '012345' '2')
+		hour=$(generate_password '1234567' '1')
+		sed -i -e "\$a*/5 * * * * sudo $BIN/v-update-letsencrypt" "/var/spool/cron/crontabs/hestiaweb"
+	fi
+fi