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

Keep track of rss mobile onion domain

Bob Mottram пре 8 година
родитељ
комит
2e41de3d91
2 измењених фајлова са 6 додато и 3 уклоњено
  1. 5
    2
      src/freedombone-app-rss
  2. 1
    1
      src/freedombone-utils-onion

+ 5
- 2
src/freedombone-app-rss Прегледај датотеку

259
 
259
 
260
     nginx_dissite $RSS_READER_DOMAIN_NAME
260
     nginx_dissite $RSS_READER_DOMAIN_NAME
261
     function_check remove_onion_service
261
     function_check remove_onion_service
262
-    remove_onion_service rss_mobile ${RSS_MOBILE_READER_ONION_PORT}
262
+    remove_onion_service mobilerss ${RSS_MOBILE_READER_ONION_PORT}
263
     remove_onion_service rss ${RSS_READER_ONION_PORT}
263
     remove_onion_service rss ${RSS_READER_ONION_PORT}
264
     if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then
264
     if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then
265
         rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
265
         rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
272
     remove_completion_param install_rss
272
     remove_completion_param install_rss
273
     sed -i '/RSS /d' $COMPLETION_FILE
273
     sed -i '/RSS /d' $COMPLETION_FILE
274
     sed -i '/rss /d' $COMPLETION_FILE
274
     sed -i '/rss /d' $COMPLETION_FILE
275
+    sed -i '/rss_/d' $COMPLETION_FILE
275
     remove_backup_database_local ttrss
276
     remove_backup_database_local ttrss
276
 }
277
 }
277
 
278
 
337
 
338
 
338
     sleep 2
339
     sleep 2
339
 
340
 
340
-    RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service rss_mobile 80 ${RSS_MOBILE_READER_ONION_PORT})
341
+    RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service mobilerss 80 ${RSS_MOBILE_READER_ONION_PORT})
342
+
343
+    set_completion_param "rss_mobile onion domain" "$RSS_MOBILE_READER_ONION_HOSTNAME"
341
 
344
 
342
     echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
345
     echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
343
     echo "  listen 127.0.0.1:$RSS_MOBILE_READER_ONION_PORT;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
346
     echo "  listen 127.0.0.1:$RSS_MOBILE_READER_ONION_PORT;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME

+ 1
- 1
src/freedombone-utils-onion Прегледај датотеку

59
     while [ ! -f ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname ]; do
59
     while [ ! -f ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname ]; do
60
         sleep 1
60
         sleep 1
61
         sleep_ctr=$((sleep_ctr + 1))
61
         sleep_ctr=$((sleep_ctr + 1))
62
-        if [ $sleep_ctr -gt 10 ]; then
62
+        if [ $sleep_ctr -gt 20 ]; then
63
             break
63
             break
64
         fi
64
         fi
65
     done
65
     done