X-Git-Url: https://iankelling.org/git/?p=iankelling.org;a=blobdiff_plain;f=setup.sh;h=f081135e3b0f253544d1f2a1981cb939ca6cfd09;hp=a68c4fc7e0a6ff9d10ba02e417a637cc0ff57d37;hb=HEAD;hpb=6ae93360501151f3625f6d988cee7047b7acc786
diff --git a/setup.sh b/setup.sh
index a68c4fc..f081135 100755
--- a/setup.sh
+++ b/setup.sh
@@ -14,40 +14,42 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# This script depends on a few other git repos of mine, such as
-# distro-functions, basic-https-conf, acme-tiny-wrapper
-
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+set -e; . /usr/local/lib/bash-bear; set +e
usage() {
- cat </dev/null || $s apt-get -y install apache2
type -P sqlite3 &>/dev/null || $s apt-get -y install sqlite3
+type -P ffmpeg &>/dev/null || $s apt-get -y install ffmpeg
-acme-tiny-wrapper $domain
-
pkgs=(
- # build.rb dependencies
- ruby-pygments.rb ruby-safe-yaml ruby-sass
- # python pkgs used for o(n^2) voting blog entry
- python-bcrypt python-passlib
- # gitweb pkgs
- gitweb highlight
+ # build.rb dependencies
+ ruby-pygments.rb ruby-safe-yaml ruby-sass
+ # python pkgs used for o(n^2) voting blog entry
+ # # commented out, needs update to python3
+ #python-bcrypt python-passlib
+ # gitweb pkgs
+ gitweb highlight
)
if $deb8; then
- pkgs+=(build-essential ruby-dev)
+ pkgs+=(build-essential ruby-dev)
else
- pkgs+=(ruby-redcarpet)
+ pkgs+=(ruby-redcarpet)
fi
-
-$s apt-get -y install ${pkgs[@]}
+source /a/bin/distro-functions/src/package-manager-abstractions
+pi ${pkgs[@]}
if $deb8; then
- sudo gem install redcarpet
+ sudo gem install redcarpet
fi
chmod og+x _site/on2vote/vote.py
@@ -138,7 +144,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
our \$projects_list_group_categories = 1;
EOF
-apache-site -p $port - $domain <
# to run python scripts with cgi
@@ -146,6 +152,11 @@ apache-site -p $port - $domain <
+
+ Options Indexes
+
+
+
Options +ExecCGI
SetHandler cgi-script