Jelajahi Sumber

Merge pull request #188 from kristankenney/default-page-templates

Refresh template files when upgrading
Kristan Kenney 7 tahun lalu
induk
melakukan
6ca6c69e27
3 mengubah file dengan 7 tambahan dan 4 penghapusan
  1. 2 3
      install/hst-install-debian.sh
  2. 1 1
      install/hst-install-ubuntu.sh
  3. 4 0
      src/deb/hestia/postinst

+ 2 - 3
install/hst-install-debian.sh

@@ -973,9 +973,8 @@ cp -rf $hestiacp/packages $HESTIA/data/
 # Installing templates
 # Installing templates
 cp -rf $hestiacp/templates $HESTIA/data/
 cp -rf $hestiacp/templates $HESTIA/data/
 
 
-# Copying index.html to default documentroot
-cp $HESTIA/data/templates/web/skel/public_html/index.html /var/www/
-sed -i 's/%domain%/It worked!/g' /var/www/index.html
+# Copy default "Success" page for unassigned hosts
+cp -rf $hestiacp/templates/web/unassigned/* /var/www/
 
 
 # Installing firewall rules
 # Installing firewall rules
 cp -rf $hestiacp/firewall $HESTIA/data/
 cp -rf $hestiacp/firewall $HESTIA/data/

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -947,7 +947,7 @@ cp -rf $hestiacp/packages $HESTIA/data/
 cp -rf $hestiacp/templates $HESTIA/data/
 cp -rf $hestiacp/templates $HESTIA/data/
 
 
 # Copy default "Success" page for unassigned hosts
 # Copy default "Success" page for unassigned hosts
-cp -rf $HESTIA/data/templates/web/unassigned/* /var/www/
+cp -rf $hestiacp/templates/web/unassigned/* /var/www/
 
 
 # Installing firewall rules
 # Installing firewall rules
 cp -rf $hestiacp/firewall $HESTIA/data/
 cp -rf $hestiacp/firewall $HESTIA/data/

+ 4 - 0
src/deb/hestia/postinst

@@ -68,4 +68,8 @@ if [ ! -z "$BACKEND_PORT" ]; then
     /usr/local/hestia/bin/v-change-sys-port $BACKEND_PORT
     /usr/local/hestia/bin/v-change-sys-port $BACKEND_PORT
 fi
 fi
 
 
+# Update Web and DNS templates
+rm -rf /usr/local/hestia/data/templates/*
+cp -rf /usr/local/hestia/install/ubuntu/18.04/templates/* /usr/local/hestia/data/templates/
+
 exit 0
 exit 0