Sfoglia il codice sorgente

Remove legacy freedns update command

Bob Mottram 8 anni fa
parent
commit
d242b21900
2 ha cambiato i file con 8 aggiunte e 4 eliminazioni
  1. 2
    4
      src/freedombone-app-htmly
  2. 6
    0
      src/freedombone-utils-dns

+ 2
- 4
src/freedombone-app-htmly Vedi File

325
         rm -rf /var/www/$HTMLY_DOMAIN_NAME
325
         rm -rf /var/www/$HTMLY_DOMAIN_NAME
326
     fi
326
     fi
327
     if [ $HTMLY_CODE ]; then
327
     if [ $HTMLY_CODE ]; then
328
-        if [ -f /usr/bin/dynamicdns ]; then
329
-            sed -i "/$HTMLY_DOMAIN_NAME/d" /usr/bin/dynamicdns
330
-            sed -i "/$HTMLY_CODE/d" /usr/bin/dynamicdns
331
-        fi
328
+        sed -i '/HTMLY_DOMAIN_NAME.*/d' $CONFIGURATION_FILE
329
+        sed -i '/HTMLY_CODE.*/d' $CONFIGURATION_FILE
332
     fi
330
     fi
333
     function_check remove_onion_service
331
     function_check remove_onion_service
334
     remove_onion_service htmly ${HTMLY_ONION_PORT}
332
     remove_onion_service htmly ${HTMLY_ONION_PORT}

+ 6
- 0
src/freedombone-utils-dns Vedi File

108
         return
108
         return
109
     fi
109
     fi
110
 
110
 
111
+    # remove any legacy command
112
+    if [ -f /usr/bin/dynamicdns ]; then
113
+        rm /usr/bin/dynamicdns
114
+    fi
115
+
116
+    # add the update command to cron
111
     if ! grep -q "/usr/local/bin/freedombone-freedns" /etc/crontab; then
117
     if ! grep -q "/usr/local/bin/freedombone-freedns" /etc/crontab; then
112
         function_check cron_add_mins
118
         function_check cron_add_mins
113
         cron_add_mins 3 '/usr/local/bin/freedombone-freedns'
119
         cron_add_mins 3 '/usr/local/bin/freedombone-freedns'