From f31503962dc6b3db45e9b392541bd46c0f4778ca Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 17 Aug 2018 21:06:52 +0100
Subject: [PATCH] Show onion url
---
src/freedombone-utils-webadmin | 9 +++++++++
webadmin/EN/app_template.html | 1 +
2 files changed, 10 insertions(+)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index d84fb6fa3..3992a7e75 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -446,6 +446,10 @@ function web_admin_create_installed_apps {
else
domain_name=$(cat "/var/lib/tor/hidden_service_${app_name}/hostname")
fi
+ onion_domain_name=
+ if [ -f "/var/lib/tor/hidden_service_${app_name}/hostname" ]; then
+ onion_domain_name="/var/lib/tor/hidden_service_${app_name}/hostname"
+ fi
if [ "$domain_name" ]; then
if [[ "$domain_name" != *'.onion' ]]; then
domain_name="https://${!test_domain_name}"
@@ -480,6 +484,11 @@ function web_admin_create_installed_apps {
sed -i "s|HOSTNAME|$(hostname)|g" "$filename"
sed -i "s|APPNAME|${app_name}|g" "$filename"
sed -i "s|APPURL|${domain_name}|g" "$filename"
+ if [[ "$ONION_ONLY" == 'no' ]]; then
+ sed -i '/ONIONURL/d' "$filename"
+ else
+ sed -i "s|ONIONURL|${onion_domain_name}|g" "$filename"
+ fi
sed -i "s|APPDESCRIPTION|${DESCRIPTION}|g" "$filename"
installed_apps_ctr=$((installed_apps_ctr+1))
diff --git a/webadmin/EN/app_template.html b/webadmin/EN/app_template.html
index 04834adb4..cad575fba 100644
--- a/webadmin/EN/app_template.html
+++ b/webadmin/EN/app_template.html
@@ -84,6 +84,7 @@
<h1>APPNAME</h1>
<p class="appdesc">APPDESCRIPTION</p>
<p class="appurl"><a href="APPURL">APPURL</a></p>
+ <p class="appurl"><a href="ONIONURL">ONIONURL</a></p>
<br>
<form action="removeappconfirm.php" method="post">
<input type="hidden" name="app_name" value="APPNAME">
--
GitLab