From 6290387734ffc8b14cbec3140daa75bff070d385 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 6 Jul 2016 16:59:59 +0100
Subject: [PATCH] Remove some annoying variant boilerplate

---
 src/freedombone-app-blog        |  3 ---
 src/freedombone-app-dlna        |  7 +------
 src/freedombone-app-gnusocial   | 22 ----------------------
 src/freedombone-app-gogs        |  3 ---
 src/freedombone-app-hubzilla    |  3 ---
 src/freedombone-app-ipfs        |  7 -------
 src/freedombone-app-irc         |  6 ------
 src/freedombone-app-mediagoblin |  3 ---
 src/freedombone-app-mumble      |  6 ------
 src/freedombone-app-rss         | 12 ------------
 src/freedombone-app-sip         | 12 ------------
 src/freedombone-app-syncthing   |  3 ---
 src/freedombone-app-tox         |  8 --------
 src/freedombone-app-webmail     |  4 ----
 src/freedombone-app-wiki        |  3 ---
 src/freedombone-app-xmpp        |  7 -------
 src/freedombone-app-zeronet     | 19 -------------------
 17 files changed, 1 insertion(+), 127 deletions(-)

diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog
index 838ad2c8..a7a68669 100755
--- a/src/freedombone-app-blog
+++ b/src/freedombone-app-blog
@@ -86,9 +86,6 @@ function get_blog_admin_password {
 }
 
 function install_blog {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if [ ! $FULLBLOG_DOMAIN_NAME ]; then
 		echo $'The blog domain name was not specified'
 		exit 5062
diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index f8f11f33..8fc05eeb 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -42,9 +42,6 @@ function configure_firewall_for_dlna {
 		# docker does its own firewalling
 		return
 	fi
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
-		return
-	fi
 	iptables -A INPUT -p udp --dport 1900 -j ACCEPT
 	iptables -A INPUT -p tcp --dport 8200 -j ACCEPT
 	function_check save_firewall_settings
@@ -83,9 +80,7 @@ function install_dlna_main {
 	if grep -Fxq "install_dlna_main" $COMPLETION_FILE; then
 		return
 	fi
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
+
 	apt-get -y install minidlna
 
 	if [ ! -f /etc/minidlna.conf ]; then
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index df0fd016..1caf15ca 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -110,9 +110,6 @@ function remove_gnusocial {
 }
 
 function install_gnusocial_main {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if [ ! $MICROBLOG_DOMAIN_NAME ]; then
 		echo $'No domain name was given for the microblog'
 		exit 7359
@@ -389,10 +386,6 @@ function install_gnusocial_main {
 }
 
 function install_gnusocial_plugin_sharings {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
 		echo $'No local/plugins directory found for the microblog'
 		exit 72945
@@ -451,10 +444,6 @@ function install_gnusocial_plugin_sharings {
 }
 
 function install_gnusocial_plugin_sharings_theme {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
 		echo $'No local/plugins directory found for the microblog'
 		exit 74458
@@ -503,9 +492,6 @@ function install_gnusocial_plugin_sharings_theme {
 function expire_gnusocial_posts {
 	# To prevent the database size from growing endlessly this script expires posts
 	# after a number of months
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
 		return
 	fi
@@ -559,10 +545,6 @@ function expire_gnusocial_posts {
 }
 
 function install_gnusocial_theme {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	# update to the next commit
 	function_check set_repo_commit
 	set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins/Qvitter "GNU Social theme commit" "$MICROBLOG_THEME_COMMIT" $MICROBLOG_THEME_REPO
@@ -662,10 +644,6 @@ function install_gnusocial_theme {
 }
 
 function install_gnusocial_markdown {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	MICROBLOG_PATH=/var/www/$MICROBLOG_DOMAIN_NAME/htdocs
 
 	# update to the next commit
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 51cd8088..583fecd1 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -83,9 +83,6 @@ function remove_gogs {
 }
 
 function install_gogs {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if [ ! $GIT_DOMAIN_NAME ]; then
 		return
 	fi
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index afd06c44..6516eaa2 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -86,9 +86,6 @@ function remove_hubzilla {
 }
 
 function install_hubzilla {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if [ ! $HUBZILLA_DOMAIN_NAME ]; then
 		return
 	fi
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 690434b9..368a9f83 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -74,9 +74,6 @@ function remove_ipfs {
 }
 
 function configure_firewall_for_ipfs {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_ipfs" $COMPLETION_FILE; then
 		return
 	fi
@@ -92,10 +89,6 @@ function configure_firewall_for_ipfs {
 }
 
 function install_ipfs {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_ipfs" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index bd0494f9..2f61542e 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -93,9 +93,6 @@ function configure_firewall_for_irc {
 }
 
 function install_irc_server {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
 		return
 	fi
@@ -214,9 +211,6 @@ function install_irc_server {
 }
 
 function install_irc_client {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if grep -Fxq "install_irc_client" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index dae87f57..17657720 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -54,9 +54,6 @@ function remove_mediagoblin {
 }
 
 function install_mediagoblin {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
 		return
 	fi
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index 971c4d4b..34ec7583 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -90,9 +90,6 @@ function get_voip_server_password {
 }
 
 function configure_firewall_for_voip {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_voip" $COMPLETION_FILE; then
 		return
 	fi
@@ -109,9 +106,6 @@ function configure_firewall_for_voip {
 }
 
 function install_mumble {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
 	if grep -Fxq "install_mumble" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index e238e04f..999c7e00 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -120,10 +120,6 @@ function rss_modifications {
 }
 
 function install_rss_main {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_rss_main" $COMPLETION_FILE; then
 		return
 	fi
@@ -373,10 +369,6 @@ function install_rss_main {
 }
 
 function install_rss_gnusocial {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if [ ! $MICROBLOG_DOMAIN_NAME ]; then
 		return
 	fi
@@ -418,10 +410,6 @@ function install_rss_gnusocial {
 }
 
 function install_rss_mobile_reader {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if [ ! $RSS_READER_PATH ]; then
 		RSS_READER_PATH=/etc/share/tt-rss
 	fi
diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip
index 5eafbc42..0f94c97a 100755
--- a/src/freedombone-app-sip
+++ b/src/freedombone-app-sip
@@ -80,9 +80,6 @@ function remove_sip {
 }
 
 function configure_firewall_for_voip_turn {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_voip_turn" $COMPLETION_FILE; then
 		return
 	fi
@@ -102,9 +99,6 @@ function configure_firewall_for_voip_turn {
 
 
 function configure_firewall_for_sip4 {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_sip4" $COMPLETION_FILE; then
 		return
 	fi
@@ -170,9 +164,6 @@ function update_sipwitch_daemon {
 }
 
 function install_sip_main {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
 	if grep -Fxq "install_sip_main" $COMPLETION_FILE; then
 		return
 	fi
@@ -260,9 +251,6 @@ function install_sip_main {
 }
 
 function install_sip_turn {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
 	if grep -Fxq "install_sip_turn" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 7a55226a..2fcf5d31 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -84,9 +84,6 @@ function configure_firewall_for_syncthing {
 }
 
 function install_syncthing {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
 	if grep -Fxq "install_syncthing" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 66ed8137..4a9f992d 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -177,10 +177,6 @@ function tox_avahi {
 }
 
 function install_tox_node {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
 		return
 	fi
@@ -232,10 +228,6 @@ function install_tox_node {
 }
 
 function install_tox_client {
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_tox_client" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index 9efd0380..4a6c0af3 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -74,10 +74,6 @@ function remove_webmail {
 }
 
 function install_webmail {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_webmail" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-wiki b/src/freedombone-app-wiki
index 93345481..db694acf 100755
--- a/src/freedombone-app-wiki
+++ b/src/freedombone-app-wiki
@@ -83,9 +83,6 @@ function get_wiki_admin_password {
 }
 
 function install_wiki {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MASH" ]]; then
-		return
-	fi
 	if grep -Fxq "install_wiki" $COMPLETION_FILE; then
 		return
 	fi
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 252dcd14..77fd0dae 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -172,10 +172,6 @@ function remove_xmpp {
 }
 
 function install_xmpp_main {
-    if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-        return
-    fi
-
     update_prosody_modules
 
     if grep -Fxq "install_xmpp_main" $COMPLETION_FILE; then
@@ -352,9 +348,6 @@ function install_xmpp_main {
 }
 
 function install_xmpp_client {
-    if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-        return
-    fi
     if grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then
         return
     fi
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index 3f884f8a..8ec6127d 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -123,9 +123,6 @@ function configure_firewall_for_zeronet {
 	if grep -Fxq "configure_firewall_for_zeronet" $COMPLETION_FILE; then
 		return
 	fi
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
 	iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $ZERONET_PORT -j ACCEPT
 	iptables -A INPUT -i $WIFI_INTERFACE -p tcp --dport $ZERONET_PORT -j ACCEPT
 	iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $TRACKER_PORT -j ACCEPT
@@ -140,10 +137,6 @@ function configure_firewall_for_zeronet {
 }
 
 function install_zeronet_blog {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then
 		return
 	fi
@@ -243,10 +236,6 @@ function install_zeronet_blog {
 }
 
 function install_zeronet_mail {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then
 		return
 	fi
@@ -346,10 +335,6 @@ function install_zeronet_mail {
 }
 
 function install_zeronet_forum {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_forum" $COMPLETION_FILE; then
 		return
 	fi
@@ -443,10 +428,6 @@ function install_zeronet_forum {
 }
 
 function install_zeronet_main {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_main" $COMPLETION_FILE; then
 		return
 	fi