Split provisioning in more profiles

4 files changed, 94 insertions, 30 deletions

diff --git a/share/provision/desktop-basic b/share/provision/desktop-basic
index 40fa720..8450283 100755
--- a/share/provision/desktop-basic
+++ b/share/provision/desktop-basic
@@ -45,22 +45,8 @@ apps/metadot/metadot load-bundle desktop-basic
 apps/metadot/metadot deps-bundle desktop-basic
 
 # Additional packages
-echo "Installing additional packages..."
-$APT_INSTALL xpra lightdm firefox-esr chromium firejail
-
-# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861744
-$APT_INSTALL torbrowser-launcher
-
-# Luakit using stowpkg
-if [ ! -x "$HOME/apps/stowpkg/tree/`uname -m`/bin/luakit" ]; then
-  $APT_INSTALL make stow
-  apps/stowpkg/stowpkg install luakit
-else
-  apps/stowpkg/stowpkg upgrade luakit
-fi
-
-# Ensure we have an updated qutebrowser
-apps/qutebrowser/qutebrowser update
+echo "Installing additional desktop-basic packages..."
+$APT_INSTALL xpra lightdm firejail
 
 # System-wide configuration
 sudo cp $DIRNAME/files/desktop-basic/etc/lightdm/lightdm.conf /etc/lightdm/lightdm.conf
@@ -87,16 +73,3 @@ mkdir -p $HOME/.custom
 if [ ! -e "$HOME/.custom/xsession" ]; then
   cp $DIRNAME/files/desktop-basic/home/user/.custom/xsession $HOME/.custom/xsession
 fi
-
-# Mozilla configuration
-# Create this config using "cd $HOME && /bin/tar jcvf mozilla.tar.bz2 .mozilla"
-if [ ! -d "$HOME/.mozilla" ]; then
-  ( cd $HOME && tar xvf $DIRNAME/files/desktop-basic/mozilla/mozilla.tar.bz2 )
-fi
-
-# Chromium configuration
-# Create this config using "cd $HOME && /bin/tar jcvf chromium.tar.bz2 .config/chromium"
-if [ ! -d "$HOME/.config/chromium" ]; then
-  ( cd $HOME && tar xvf $DIRNAME/files/desktop-basic/chromium/chromium.tar.bz2 )
-  ( cd $HOME && tar xvf $DIRNAME/files/desktop-basic/chromium/chromium-profiles.tar.bz2 )
-fi
diff --git a/share/provision/tor-browser b/share/provision/tor-browser
new file mode 100755
index 0000000..88895d7
--- /dev/null
+++ b/share/provision/tor-browser
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# Tor desktop provision example
+#
+# Copyright (C) 2017 Silvio Rhatto - rhatto at riseup.net
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Parameters
+DIRNAME="`dirname $0`"
+BASENAME="`basename $0`"
+HOSTNAME="$1"
+DOMAIN="$2"
+MIRROR="$3"
+APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
+
+# Provision the basic stuff
+$DIRNAME/desktop-basic $HOSTNAME $DOMAIN $MIRROR
+
+# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861744
+$APT_INSTALL torbrowser-launcher
diff --git a/share/provision/vpn b/share/provision/vpn
index ec714ee..18f3e7c 100755
--- a/share/provision/vpn
+++ b/share/provision/vpn
@@ -27,7 +27,7 @@ MIRROR="$3"
 APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 
 # Provision the basic stuff
-$DIRNAME/desktop-basic $HOSTNAME $DOMAIN $MIRROR
+$DIRNAME/web $HOSTNAME $DOMAIN $MIRROR
 
 # Install OpenVPN and dnsutils (which provides nslookup)
 $APT_INSTALL openvpn resolvconf dnsutils curl
diff --git a/share/provision/web b/share/provision/web
new file mode 100755
index 0000000..73f2532
--- /dev/null
+++ b/share/provision/web
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+#
+# Web desktop provision example
+#
+# Copyright (C) 2017 Silvio Rhatto - rhatto at riseup.net
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Parameters
+DIRNAME="`dirname $0`"
+BASENAME="`basename $0`"
+HOSTNAME="$1"
+DOMAIN="$2"
+MIRROR="$3"
+APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
+
+# Provision the basic stuff
+$DIRNAME/tor-browser $HOSTNAME $DOMAIN $MIRROR
+
+# Additional packages
+echo "Installing additional web packages..."
+$APT_INSTALL firefox-esr chromium
+
+# Luakit using stowpkg
+if [ ! -x "$HOME/apps/stowpkg/tree/`uname -m`/bin/luakit" ]; then
+  $APT_INSTALL make stow
+  apps/stowpkg/stowpkg install luakit
+else
+  apps/stowpkg/stowpkg upgrade luakit
+fi
+
+# Ensure we have an updated qutebrowser
+apps/qutebrowser/qutebrowser update
+
+# Mozilla configuration
+# Create this config using "cd $HOME && /bin/tar jcvf mozilla.tar.bz2 .mozilla"
+if [ ! -d "$HOME/.mozilla" ]; then
+  ( cd $HOME && tar xvf $DIRNAME/files/desktop-basic/mozilla/mozilla.tar.bz2 )
+fi
+
+# Chromium configuration
+# Create this config using "cd $HOME && /bin/tar jcvf chromium.tar.bz2 .config/chromium"
+if [ ! -d "$HOME/.config/chromium" ]; then
+  ( cd $HOME && tar xvf $DIRNAME/files/desktop-basic/chromium/chromium.tar.bz2 )
+  ( cd $HOME && tar xvf $DIRNAME/files/desktop-basic/chromium/chromium-profiles.tar.bz2 )
+fi