From 1226dfde98d15449706f1117d38c16bca285e417 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 18 Oct 2018 13:49:43 +0100
Subject: [PATCH] Move function
---
src/freedombone-app-scuttlebot | 9 ++++-----
src/freedombone-utils-dns | 5 +++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index b9e0d099c..32a52fd6a 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -38,6 +38,10 @@ SCUTTLEBOT_REPLICATE_NODES=10
SCUTTLEBOT_PORT=8010
SCUTTLEBOT_ONION_PORT=8623
+SCUTTLEBOT_SHORT_DESCRIPTION=$'Scuttlebot Pub'
+SCUTTLEBOT_DESCRIPTION=$'Scuttlebot Pub'
+SCUTTLEBOT_MOBILE_APP_URL='https://f-droid.org/en/packages/se.manyver/'
+
scuttlebot_variables=(MY_USERNAME
DEFAULT_DOMAIN_NAME
SYSTEM_TYPE)
@@ -249,11 +253,6 @@ EOF
echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/scuttlebot.service"
}
-function enable_mdns {
- # files gw_name myhostname mdns4_minimal [NOTFOUND=return] dns
- sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
-}
-
function install_scuttlebot {
function_check install_nodejs
install_nodejs scuttlebot
diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns
index 21c9b3852..f096ef9f3 100755
--- a/src/freedombone-utils-dns
+++ b/src/freedombone-utils-dns
@@ -95,6 +95,11 @@ EXTERNAL_IP_SERVICES=( \
'http://ipinfo.io/' \
'http://httpbin.org/ip')
+function enable_mdns {
+ # files gw_name myhostname mdns4_minimal [NOTFOUND=return] dns
+ sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
+}
+
function update_inadyn_config {
if [ ! -f "${INADYN_CONFIG_FILE}" ]; then
return
--
GitLab