Rename DDNS apps so they show up together

nextcloud · Sep 13, 2018 · e26a834 · e26a834
1 parent 7703ceb
commit e26a834
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 73 deletions.
diff --git a/changelog.md b/changelog.md
diff --git a/etc/ncp-config.d/duckDNS.sh → etc/ncp-config.d/DDNS_duckDNS.sh b/etc/ncp-config.d/duckDNS.sh → etc/ncp-config.d/DDNS_duckDNS.sh
diff --git a/etc/ncp-config.d/freeDNS.sh → etc/ncp-config.d/DDNS_freeDNS.sh b/etc/ncp-config.d/freeDNS.sh → etc/ncp-config.d/DDNS_freeDNS.sh
diff --git a/etc/ncp-config.d/no-ip.sh → etc/ncp-config.d/DDNS_no-ip.sh b/etc/ncp-config.d/no-ip.sh → etc/ncp-config.d/DDNS_no-ip.sh
diff --git a/etc/ncp-config.d/spDYN.sh → etc/ncp-config.d/DDNS_spDYN.sh b/etc/ncp-config.d/spDYN.sh → etc/ncp-config.d/DDNS_spDYN.sh
diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
@@ -95,7 +95,7 @@
   // sanity checks
   if ( !$_POST['ref'] ) exit( '{ "output": "Invalid request" }' );
 
-  preg_match( '/^[0-9A-Za-z-]+$/' , $_POST['ref'] , $matches )
+  preg_match( '/^[0-9A-Za-z_-]+$/' , $_POST['ref'] , $matches )
     or exit( '{ "output": "Invalid input" , "token": "' . getCSRFToken() . '" }' );
 
   // CSRF check

diff --git a/ncp-web/wizard/JS/wizard.js b/ncp-web/wizard/JS/wizard.js
@@ -247,7 +247,7 @@ $(document).ready(function(){
 
 	// Enable FreeDNS step
 	$('#ddns-enable-freedns').on('click', function(){
-        launch_action( 'freeDNS', 
+        launch_action( 'DDNS_freeDNS', 
           {
             "ACTIVE":"yes",
             "DOMAIN":     $("#ddns-domain" ).val(),
@@ -269,7 +269,7 @@ $(document).ready(function(){
 
 	// Enable noip step
 	$('#ddns-enable-noip').on('click', function(){
-          launch_action( 'no-ip', 
+          launch_action( 'DDNS_no-ip', 
           {
             "ACTIVE":"yes",
             "DOMAIN": $("#ddns-domain"  ).val(),

diff --git a/update.sh b/update.sh
@@ -45,6 +45,14 @@ source /usr/local/etc/library.sh
 
 mkdir -p "$CONFDIR"
 
+# rename DDNS entries TODO temporary
+[[ -f "$CONFDIR"/no-ip.sh ]] && {
+  mv "$CONFDIR"/no-ip.sh   "$CONFDIR"/DDNS_no-ip.sh
+  mv "$CONFDIR"/freeDNS.sh "$CONFDIR"/DDNS_freeDNS.sh
+  mv "$CONFDIR"/duckDNS.sh "$CONFDIR"/DDNS_duckDNS.sh
+  mv "$CONFDIR"/spDYN.sh   "$CONFDIR"/DDNS_spDYN.sh
+}
+
 # prevent installing some apt packages in the docker version
 [[ -f /.docker-image ]] && {
   for opt in $EXCL_DOCKER; do 
@@ -127,7 +135,6 @@ chmod 770                  /var/www/ncp-web
     apt-get install -y --no-install-recommends php-imagick imagemagick-6-common
   }
 
-
 } # end - only live updates
 
 exit 0