Browse Source

Keep track of rss mobile onion domain

Bob Mottram 7 years ago
parent
commit
2e41de3d91
2 changed files with 6 additions and 3 deletions
  1. 5
    2
      src/freedombone-app-rss
  2. 1
    1
      src/freedombone-utils-onion

+ 5
- 2
src/freedombone-app-rss View File

@@ -259,7 +259,7 @@ function remove_rss {
259 259
 
260 260
     nginx_dissite $RSS_READER_DOMAIN_NAME
261 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 263
     remove_onion_service rss ${RSS_READER_ONION_PORT}
264 264
     if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then
265 265
         rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
@@ -272,6 +272,7 @@ function remove_rss {
272 272
     remove_completion_param install_rss
273 273
     sed -i '/RSS /d' $COMPLETION_FILE
274 274
     sed -i '/rss /d' $COMPLETION_FILE
275
+    sed -i '/rss_/d' $COMPLETION_FILE
275 276
     remove_backup_database_local ttrss
276 277
 }
277 278
 
@@ -337,7 +338,9 @@ function install_rss_main {
337 338
 
338 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 345
     echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
343 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 View File

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