From 580fe547dcaac8d7c2376a517bff5c0c9cb7d2bf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 9 Jul 2016 11:36:12 +0100
Subject: [PATCH] Placeholder reconfigure functions
---
src/freedombone-app-babel | 4 ++++
src/freedombone-app-batman | 4 ++++
src/freedombone-app-blog | 4 ++++
src/freedombone-app-cjdns | 4 ++++
src/freedombone-app-dlna | 4 ++++
src/freedombone-app-emacs | 4 ++++
src/freedombone-app-gnusocial | 4 ++++
src/freedombone-app-gogs | 4 ++++
src/freedombone-app-hubzilla | 4 ++++
src/freedombone-app-ipfs | 4 ++++
src/freedombone-app-irc | 4 ++++
src/freedombone-app-mediagoblin | 4 ++++
src/freedombone-app-mumble | 4 ++++
src/freedombone-app-rss | 4 ++++
src/freedombone-app-searx | 4 ++++
src/freedombone-app-sip | 4 ++++
src/freedombone-app-syncthing | 4 ++++
src/freedombone-app-tox | 4 ++++
src/freedombone-app-vpn | 4 ++++
src/freedombone-app-webmail | 4 ++++
src/freedombone-app-wiki | 4 ++++
src/freedombone-app-xmpp | 4 ++++
src/freedombone-app-zeronet | 4 ++++
src/freedombone-restore-local | 1 -
src/freedombone-tests | 2 +-
25 files changed, 93 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-app-babel b/src/freedombone-app-babel
index b8929b758..870307233 100755
--- a/src/freedombone-app-babel
+++ b/src/freedombone-app-babel
@@ -33,6 +33,10 @@ VARIANTS=''
ENABLE_BABEL="no"
BABEL_PORT=6696
+function reconfigure_babel {
+ echo -n ''
+}
+
function upgrade_babel {
echo -n ''
}
diff --git a/src/freedombone-app-batman b/src/freedombone-app-batman
index 9083b4cf6..cfa334d15 100755
--- a/src/freedombone-app-batman
+++ b/src/freedombone-app-batman
@@ -46,6 +46,10 @@ function configure_firewall_for_batma {
echo 'configure_firewall_for_batman' >> $COMPLETION_FILE
}
+function reconfigure_batman {
+ echo -n ''
+}
+
function upgrade_batman {
echo -n ''
}
diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog
index ef86d7f7f..cc1315aa8 100755
--- a/src/freedombone-app-blog
+++ b/src/freedombone-app-blog
@@ -38,6 +38,10 @@ FULLBLOG_COMMIT='bf5fe9486160be4da86d8987d3e5c977e1dc6d32'
MY_BLOG_TITLE="My Blog"
MY_BLOG_SUBTITLE="Another ${PROJECT_NAME} Blog"
+function reconfigure_blog {
+ echo -n ''
+}
+
function upgrade_blog {
if ! grep -Fxq "install_blog" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-cjdns b/src/freedombone-app-cjdns
index d7f7a35cd..d347bc5e3 100755
--- a/src/freedombone-app-cjdns
+++ b/src/freedombone-app-cjdns
@@ -41,6 +41,10 @@ CJDNS_COMMIT='13189fde111d0500427a7a0ce06a970753527bca'
CJDCMD_REPO="https://github.com/inhies/cjdcmd"
CJDCMD_COMMIT='973cca6ed0eecf9041c3403a40193c0b1291b808'
+function reconfigure_cjdns {
+ echo -n ''
+}
+
function upgrade_cjdns {
if ! grep -Fxq "install_cjdns" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index fbb4dfb22..5ca6cb661 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -30,6 +30,10 @@
VARIANTS='full media'
+function reconfigure_dlna {
+ echo ''
+}
+
function upgrade_dlna {
echo ''
}
diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index 9b1c2f2ee..d4b65569e 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -30,6 +30,10 @@
VARIANTS='all'
+function reconfigure_emacs {
+ echo -n ''
+}
+
function upgrade_emacs {
echo -n ''
}
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 11ccaf605..8d745ad57 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -68,6 +68,10 @@ function gnusocial_running_script {
chmod +x /etc/cron.hourly/gnusocial-daemons
}
+function reconfigure_gnusocial {
+ echo -n ''
+}
+
function upgrade_gnusocial {
if ! grep -Fxq "install_gnusocial_main" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index ad6d25228..eaa4c4702 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -37,6 +37,10 @@ GIT_DOMAIN_REPO="https://github.com/gogits/gogs"
GIT_ADMIN_PASSWORD=
GOGS_COMMIT='3fb4f7f4980b4339fd9ef6a3ba5b0acab83d264d'
+function reconfigure_gogs {
+ echo -n ''
+}
+
function upgrade_gogs {
if ! grep -Fxq "install_gogs" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index ac94a55b7..4b343f457 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -40,6 +40,10 @@ HUBZILLA_ADMIN_PASSWORD=
HUBZILLA_COMMIT='2d79e75788aa71664a379c4cea0b6bfe3ab87ad0'
HUBZILLA_ADDONS_COMMIT='67b40c7a40f328a93ee030eb15e9e1261f3cba64'
+function reconfigure_hubzilla {
+ echo -n ''
+}
+
function upgrade_hubzilla {
if ! grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 8e6e0a39f..e56ddb274 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -34,6 +34,10 @@ IPFS_GO_REPO="https://github.com/ipfs/go-ipfs"
IPFS_COMMIT='20b06a4cbce8884f5b194da6e98cb11f2c77f166'
IPFS_PORT=4001
+function reconfigure_ipfs {
+ echo -n ''
+}
+
function upgrade_ipfs {
if ! grep -Fxq "install_ipfs" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 103695cce..241785c08 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -36,6 +36,10 @@ IRC_ONION_PORT=6697
# An optional password to log into IRC. This applies to all users
IRC_PASSWORD=
+function reconfigure_irc {
+ echo -n ''
+}
+
function upgrade_irc {
echo -n ''
}
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index 0b88e8d5a..2c4c505e8 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -37,6 +37,10 @@ MEDIAGOBLIN_COMMIT='d1ac2d52fd8859c3f32fa38e4836ffe9615e5bba'
MEDIAGOBLIN_ADMIN_PASSWORD=
MEDIAGOBLIN_ONION_PORT=8096
+function reconfigure_mediagoblin {
+ echo -n ''
+}
+
function upgrade_mediagoblin {
echo -n ''
}
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index 678e8b3d0..ab7da6933 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -39,6 +39,10 @@ VOIP_PORT=64738
VOIP_DATABASE="mumble-server.sqlite"
VOIP_CONFIG_FILE="mumble-server.ini"
+function reconfigure_mumble {
+ echo -n ''
+}
+
function upgrade_mumble {
echo -n ''
}
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 8b8dcba11..dbc933b49 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -42,6 +42,10 @@ RSS_READER_PATH=/etc/share/tt-rss
RSS_READER_GNUSOCIAL_REPO="https://github.com/bashrc/ttrss-gnusocial"
RSS_READER_GNUSOCIAL_COMMIT='8b92b8f5db7b0d12459c7bd86a50f48815efe642'
+function reconfigure_rss {
+ echo -n ''
+}
+
function upgrade_rss {
if grep -Fxq "install_rss" $COMPLETION_FILE; then
function_check set_repo_commit
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index c65d3e19a..725eaac7b 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -38,6 +38,10 @@ SEARX_ONION_HOSTNAME=
SEARX_LOGIN_TEXT=$"Search engine login"
SEARX_PASSWORD=
+function reconfigure_searx {
+ echo -n ''
+}
+
function upgrade_searx {
if ! grep -Fxq "install_searx" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip
index 3f6013436..931a40cd7 100755
--- a/src/freedombone-app-sip
+++ b/src/freedombone-app-sip
@@ -37,6 +37,10 @@ VOIP_TURN_PORT=3478
VOIP_TURN_TLS_PORT=5349
VOIP_TURN_NONCE=
+function reconfigure_sip {
+ echo -n ''
+}
+
function upgrade_sip {
# remove the original sipwitch daemon if it exists
if [ -f /etc/init.d/sipwitch ]; then
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 157f502c7..d665e8ee4 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -39,6 +39,10 @@ SYNCTHING_PORT=22000
SYNCTHING_SHARED_DATA=/var/lib/syncthing/SyncShared
SYNCTHING_USER_IDS_FILE='.syncthingids'
+function reconfigure_syncthing {
+ echo -n ''
+}
+
function upgrade_syncthing {
echo -n ''
}
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 0fd62aa50..e3d15a518 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -46,6 +46,10 @@ TOXIC_REPO="https://github.com/Tox/toxic"
TOXIC_COMMIT='cf16849b374e484a33a4dffa3dfb937b59d537f2'
TOXIC_FILE=/usr/local/bin/toxic
+function reconfigure_tox {
+ echo -n ''
+}
+
function upgrade_tox {
if ! grep -Fxq "install_tox" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-vpn b/src/freedombone-app-vpn
index 2296843ff..60beebf53 100755
--- a/src/freedombone-app-vpn
+++ b/src/freedombone-app-vpn
@@ -30,6 +30,10 @@
VARIANTS=''
+function reconfigure_vpn {
+ echo -n ''
+}
+
function upgrade_vpn {
echo -n ''
}
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index c2a6431cc..48ae01046 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -38,6 +38,10 @@ WEBMAIL_ADMIN_PASSWORD=
WEB_PATH=/var/www
WEBMAIL_PATH=$WEB_PATH/webmail
+function reconfigure_webmail {
+ echo -n ''
+}
+
function upgrade_webmail {
if ! grep -Fxq "install_webmail" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-app-wiki b/src/freedombone-app-wiki
index 5dd67e5b5..8f8d088b8 100755
--- a/src/freedombone-app-wiki
+++ b/src/freedombone-app-wiki
@@ -36,6 +36,10 @@ WIKI_TITLE="${PROJECT_NAME} Wiki"
WIKI_CODE=
WIKI_ONION_PORT=8089
+function reconfigure_wiki {
+ echo -n ''
+}
+
function upgrade_wiki {
echo -n ''
}
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 3c816c5b5..12d5be38c 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -37,6 +37,10 @@ XMPP_PASSWORD=
XMPP_CIPHERS='"EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA"'
XMPP_ECC_CURVE='"secp384r1"'
+function reconfigure_xmpp {
+ echo -n ''
+}
+
function update_prosody_modules {
if [ ! -d $INSTALL_DIR/prosody-modules ]; then
return
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index a8e6dce88..5ad3c8285 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -47,6 +47,10 @@ ZERONET_DEFAULT_MAIL_TAGLINE="Mail for the Mesh"
ZERONET_ID_REPO="https://github.com/HelloZeroNet/ZeroID"
ZERONET_ID_COMMIT='ccf14fdc96fa9cdb2ddd8a7ab283a8e17a4f234b'
+function reconfigure_zeronet {
+ echo -n ''
+}
+
function upgrade_zeronet {
if ! grep -Fxq "install_zeronet" $COMPLETION_FILE; then
return
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index bf8d1a6d2..4f318fd16 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -863,7 +863,6 @@ restore_user_local
restore_certs
restore_personal_settings
restore_mailing_list
-
restore_email
restore_apps
set_user_permissions
diff --git a/src/freedombone-tests b/src/freedombone-tests
index dd99041e4..2cf7c6741 100755
--- a/src/freedombone-tests
+++ b/src/freedombone-tests
@@ -61,7 +61,7 @@ function test_app_functions {
FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
# check that these functions exist
- interface_functions=( install remove backup_local backup_remote restore_local restore_remote upgrade )
+ interface_functions=( install remove backup_local backup_remote restore_local restore_remote upgrade reconfigure )
# for all the app scripts
for filename in $FILES
--
GitLab