From 91c2608d73b82635386126b0e6055a4ef4ff915c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 18 Nov 2016 22:17:50 +0000
Subject: [PATCH] Things which don't need to be in the default install
---
src/freedombone-app-etherpad | 2 +-
src/freedombone-app-pihole | 3 ++-
src/freedombone-app-radicale | 2 +-
src/freedombone-vars | 6 +++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad
index 01c20192b..675ad761d 100755
--- a/src/freedombone-app-etherpad
+++ b/src/freedombone-app-etherpad
@@ -30,7 +30,7 @@
VARIANTS="full full-vim writer"
-IN_DEFAULT_INSTALL=1
+IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
ETHERPAD_DOMAIN_NAME=
diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole
index 202c620d1..bce6c6a67 100755
--- a/src/freedombone-app-pihole
+++ b/src/freedombone-app-pihole
@@ -33,7 +33,8 @@
VARIANTS='full full-vim adblocker'
-IN_DEFAULT_INSTALL=1
+IN_DEFAULT_INSTALL=0
+SHOW_ON_ABOUT=0
PIHOLE_IFACE=eth0
PIHOLE_DNS1='85.214.73.63'
diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale
index 9f23ff546..7cad6abf2 100755
--- a/src/freedombone-app-radicale
+++ b/src/freedombone-app-radicale
@@ -33,7 +33,7 @@
VARIANTS='full full-vim'
-IN_DEFAULT_INSTALL=1
+IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
RADICALE_DOWNLOAD_URL='http://pypi.python.org/packages/source/R/Radicale/Radicale-'
diff --git a/src/freedombone-vars b/src/freedombone-vars
index 55fb09780..7a44eca61 100755
--- a/src/freedombone-vars
+++ b/src/freedombone-vars
@@ -81,21 +81,21 @@ ENABLE_SOCIAL_KEY_MANAGEMENT="no"
UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
for f in $UTILS_FILES
do
- source $f
+ source $f
done
# include base system apps
BASE_SYSTEM_FILES=/usr/share/${PROJECT_NAME}/base/${PROJECT_NAME}-base-*
for f in $BASE_SYSTEM_FILES
do
- source $f
+ source $f
done
#include apps
APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
for f in $APP_FILES
do
- source $f
+ source $f
done
# optionally specify your name to appear on the blog
--
GitLab