free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep track of rss mobile onion domain

This commit is contained in:
Bob Mottram 2017-06-11 17:11:10 +01:00
parent 2830c5fc16
commit 2e41de3d91
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/freedombone-app-rss
View File

@ -259,7 +259,7 @@ function remove_rss {
nginx_dissite $RSS_READER_DOMAIN_NAME nginx_dissite $RSS_READER_DOMAIN_NAME
function_check remove_onion_service function_check remove_onion_service
remove_onion_service rss_mobile ${RSS_MOBILE_READER_ONION_PORT} remove_onion_service mobilerss ${RSS_MOBILE_READER_ONION_PORT}
remove_onion_service rss ${RSS_READER_ONION_PORT} remove_onion_service rss ${RSS_READER_ONION_PORT}
if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then
rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
@ -272,6 +272,7 @@ function remove_rss {
remove_completion_param install_rss remove_completion_param install_rss
sed -i '/RSS /d' $COMPLETION_FILE sed -i '/RSS /d' $COMPLETION_FILE
sed -i '/rss /d' $COMPLETION_FILE sed -i '/rss /d' $COMPLETION_FILE
sed -i '/rss_/d' $COMPLETION_FILE
remove_backup_database_local ttrss remove_backup_database_local ttrss
} }
@ -337,7 +338,9 @@ function install_rss_main {
sleep 2 sleep 2
RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service rss_mobile 80 ${RSS_MOBILE_READER_ONION_PORT}) RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service mobilerss 80 ${RSS_MOBILE_READER_ONION_PORT})
set_completion_param "rss_mobile onion domain" "$RSS_MOBILE_READER_ONION_HOSTNAME"
echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
echo " listen 127.0.0.1:$RSS_MOBILE_READER_ONION_PORT;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo " listen 127.0.0.1:$RSS_MOBILE_READER_ONION_PORT;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME

2
src/freedombone-utils-onion
View File

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