From 1ceffbd9c28ba3ff14f53cb930841a3cb9bb8001 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 19 Oct 2016 21:23:11 +0100
Subject: [PATCH] Only show certain domains on the about screen

---
 src/freedombone-app-dokuwiki    | 2 ++
 src/freedombone-app-gnusocial   | 2 ++
 src/freedombone-app-gogs        | 2 ++
 src/freedombone-app-htmly       | 2 ++
 src/freedombone-app-hubzilla    | 2 ++
 src/freedombone-app-irc         | 2 ++
 src/freedombone-app-mediagoblin | 2 ++
 src/freedombone-app-mumble      | 2 ++
 src/freedombone-app-rss         | 2 ++
 src/freedombone-app-searx       | 2 ++
 src/freedombone-app-sip         | 2 ++
 src/freedombone-app-tahoelafs   | 2 ++
 src/freedombone-app-tox         | 2 ++
 src/freedombone-app-xmpp        | 2 ++
 src/freedombone-controlpanel    | 4 ++++
 15 files changed, 32 insertions(+)

diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index 2e604adb6..acd412677 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim writer'
 
+SHOW_ON_ABOUT=1
+
 DOKUWIKI_DOMAIN_NAME=
 DOKUWIKI_ADMIN_PASSWORD=
 DOKUWIKI_TITLE="${PROJECT_NAME} Dokuwiki"
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 9dcbe10f6..ae3b55fcf 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim media'
 
+SHOW_ON_ABOUT=1
+
 GNUSOCIAL_DOMAIN_NAME=
 GNUSOCIAL_CODE=
 GNUSOCIAL_ONION_PORT=8087
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 953fc4cc7..67d4589d8 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -30,6 +30,8 @@
 
 VARIANTS='developer'
 
+SHOW_ON_ABOUT=1
+
 GOGS_USERNAME='gogs'
 GOGS_VERSION='0.9.97'
 
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index a7d059e54..508a1fcae 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -30,6 +30,8 @@
 
 VARIANTS="full full-vim writer"
 
+SHOW_ON_ABOUT=1
+
 HTMLY_DOMAIN_NAME=
 HTMLY_CODE=
 HTMLY_ONION_PORT=8086
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index 6aa64fb51..f266093d4 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim social'
 
+SHOW_ON_ABOUT=1
+
 HUBZILLA_DOMAIN_NAME=
 HUBZILLA_CODE=
 HUBZILLA_ONION_PORT=8085
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 3a210f8ea..477747d86 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim chat'
 
+SHOW_ON_ABOUT=1
+
 IRC_PORT=6697
 IRC_ONION_PORT=6697
 
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index 9b26ff445..ce3e4b216 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+SHOW_ON_ABOUT=1
+
 MEDIAGOBLIN_DOMAIN_NAME=
 MEDIAGOBLIN_CODE=
 MEDIAGOBLIN_REPO="git://git.savannah.gnu.org/mediagoblin.git"
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index 8107a68f4..5c676253c 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim chat'
 
+SHOW_ON_ABOUT=1
+
 # Password used for mumble server
 MUMBLE_SERVER_PASSWORD=
 # Port on which mumble server listens
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index f7c4a0fbf..6c7d75680 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim writer'
 
+SHOW_ON_ABOUT=1
+
 RSS_READER_REPO="https://tt-rss.org/git/tt-rss.git"
 RSS_READER_COMMIT='48007463861d8db8b2b79c2f4f54e0564edb0ec0'
 RSS_READER_ADMIN_PASSWORD=
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index 036822b69..6525ac18f 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+SHOW_ON_ABOUT=1
+
 SEARX_REPO="https://github.com/asciimoo/searx"
 SEARX_COMMIT='fee556c9904637051a9ba874ba7e71cd9f10789f'
 SEARX_PATH=/etc
diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip
index 911d89d3d..967f51f4a 100755
--- a/src/freedombone-app-sip
+++ b/src/freedombone-app-sip
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim chat'
 
+SHOW_ON_ABOUT=1
+
 SIP_SERVER_PASSWORD=
 SIP_PORT=5060
 SIP_TLS_PORT=5061
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index f93b7930e..114701127 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -30,6 +30,8 @@
 
 VARIANTS=''
 
+SHOW_ON_ABOUT=1
+
 TAHOELAFS_REPO="https://github.com/tahoe-lafs/tahoe-lafs"
 TAHOELAFS_COMMIT='30b421d48b3d1dae2ef507bf27a1f3816300cd92'
 
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index f0a3b0774..38eb5617d 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim chat'
 
+SHOW_ON_ABOUT=1
+
 TOX_PORT=33445
 TOXCORE_REPO="https://github.com/bashrc/toxcore"
 TOXCORE_COMMIT='d3fa9f82bda3a8746917502c525237427ba17d45'
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 556c36f09..8a8627e72 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -30,6 +30,8 @@
 
 VARIANTS='full full-vim chat'
 
+SHOW_ON_ABOUT=1
+
 # Directory where XMPP settings are stored
 XMPP_DIRECTORY="/var/lib/prosody"
 XMPP_PASSWORD=
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index f4c7a7419..acb690317 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -238,6 +238,10 @@ function show_domains {
 
     for app_name in "${APPS_INSTALLED_NAMES[@]}"
     do
+        if ! grep -q "SHOW_ON_ABOUT=1" /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}; then
+            continue
+        fi
+
         icann_address=${DEFAULT_DOMAIN_NAME}
         onion_address="-"
 
-- 
GitLab