Просмотр исходного кода

Small change from vesta to hestia in comments.

Raphael Schneeberger 7 лет назад
Родитель
Сommit
23188bf075

+ 5 - 5
func/domain.sh

@@ -207,11 +207,11 @@ add_web_config() {
     chown root:$user $conf
     chmod 640 $conf
 
-    if [ -z "$(grep "$conf" /etc/$1/conf.d/vesta.conf)" ]; then
+    if [ -z "$(grep "$conf" /etc/$1/conf.d/hestia.conf)" ]; then
         if [ "$1" != 'nginx' ]; then
-            echo "Include $conf" >> /etc/$1/conf.d/vesta.conf
+            echo "Include $conf" >> /etc/$1/conf.d/hestia.conf
         else
-            echo "include $conf;" >> /etc/$1/conf.d/vesta.conf
+            echo "include $conf;" >> /etc/$1/conf.d/hestia.conf
         fi
     fi
 
@@ -277,7 +277,7 @@ del_web_config() {
     fi
 
     if [ -e "$conf" ]; then
-        sed -i "\|$conf|d" /etc/$1/conf.d/vesta.conf
+        sed -i "\|$conf|d" /etc/$1/conf.d/hestia.conf
         rm -f $conf
     else
         # fallback to old style configs
@@ -291,7 +291,7 @@ del_web_config() {
     # clean-up for both config styles if there is no more domains
     web_domain=$(grep DOMAIN $USER_DATA/web.conf |wc -l)
     if [ "$web_domain" -eq '0' ]; then
-        sed -i "/.*\/$user\/conf\/web\//d" /etc/$1/conf.d/vesta.conf
+        sed -i "/.*\/$user\/conf\/web\//d" /etc/$1/conf.d/hestia.conf
         if [ -f "$conf" ]; then
             rm -f $conf
         fi

+ 1 - 1
func/remote.sh

@@ -109,7 +109,7 @@ remote_dns_health_check() {
             echo -e "following commands:\n" >> $tmpfile
             echo "v-unsuspend-remote-dns-host $HOST" >> $tmpfile
             echo "v-sync-dns-cluster $HOST" >> $tmpfile
-            echo -e "\n\n--\nVesta Control Panel\n$(hostname)" >> $tmpfile
+            echo -e "\n\n--\nHestia Control Panel\n$(hostname)" >> $tmpfile
 
             if [ "$1" = 'no_email' ]; then
                 cat $tmpfile

+ 2 - 2
install/debian/8/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 1 - 1
install/debian/8/fail2ban/jail.local

@@ -35,5 +35,5 @@ maxretry = 5
 enabled = true
 filter  = hestia
 action  = hestia[name=HESTIA]
-logpath = /var/log/vesta/auth.log
+logpath = /var/log/hestia/auth.log
 maxretry = 5

+ 1 - 1
install/debian/8/firewall/rules.conf

@@ -1,5 +1,5 @@
 RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16'
-RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'
+RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='HESTIA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'
 RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'
 RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'
 RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'

+ 2 - 2
install/debian/9/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/14.04/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/14.10/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/15.04/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/15.10/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/16.04/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/16.10/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/17.04/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/17.10/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify
 

+ 2 - 2
install/ubuntu/18.04/exim/exim4.conf.template

@@ -1,6 +1,6 @@
 ######################################################################
 #                                                                    #
-#          Exim configuration file for Vesta Control Panel           #
+#          Exim configuration file for Hestia Control Panel          #
 #                                                                    #
 ######################################################################
 
@@ -199,7 +199,7 @@ begin routers
 #  driver = manualroute
 #  domains = ! +local_domains
 #  transport = remote_smtp
-#  route_list = * smartrelay.vestacp.com
+#  route_list = * smartrelay.hestiacp.com
 #  no_more
 #  no_verify