From 50a48570a9cf75ba341c7f5885c5fb66e162c2c3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 16 Jan 2018 14:18:19 -0200 Subject: Provision: split web into web-basic and web-full scripts --- share/provision/vpn | 2 +- share/provision/web | 58 ----------------------------------------------- share/provision/web-basic | 47 ++++++++++++++++++++++++++++++++++++++ share/provision/web-full | 44 +++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 59 deletions(-) delete mode 100755 share/provision/web create mode 100755 share/provision/web-basic create mode 100755 share/provision/web-full diff --git a/share/provision/vpn b/share/provision/vpn index 18f3e7c..ec4f5ba 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/web $HOSTNAME $DOMAIN $MIRROR +$DIRNAME/web-full $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 deleted file mode 100755 index 73f2532..0000000 --- a/share/provision/web +++ /dev/null @@ -1,58 +0,0 @@ -#!/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 . -# - -# 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 diff --git a/share/provision/web-basic b/share/provision/web-basic new file mode 100755 index 0000000..5fdbc73 --- /dev/null +++ b/share/provision/web-basic @@ -0,0 +1,47 @@ +#!/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 . +# + +# 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 + +# Additional packages +echo "Installing additional web packages..." +$APT_INSTALL firefox-esr chromium + +# 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/web-full b/share/provision/web-full new file mode 100755 index 0000000..b44c76d --- /dev/null +++ b/share/provision/web-full @@ -0,0 +1,44 @@ +#!/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 . +# + +# 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/web-basic $HOSTNAME $DOMAIN $MIRROR + +# Tor +$DIRNAME/tor-browser $HOSTNAME $DOMAIN $MIRROR + +# 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 -- cgit v1.2.3