X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=setup.sh;h=41e7d5089c9e1f18924ef69543fd4ce905c4db80;hb=HEAD;hp=cfcee75694c4bf7e014d12471292b3775e6815de;hpb=a5d36b23813ae286ba3fb76e4f60ef6d267ba128;p=iankelling.org
diff --git a/setup.sh b/setup.sh
index cfcee75..f081135 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
# Copyright (C) 2016 Ian Kelling
# This program is free software: you can redistribute it and/or modify
@@ -14,34 +14,92 @@
# 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 -e; . /usr/local/lib/bash-bear; set +e
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+usage() {
+ cat </dev/null || pi apache2
-type -P sqlite3 &>/dev/null || pi sqlite3
+type -P a2enmod &>/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-redcarpet
- # 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)
+else
+ pkgs+=(ruby-redcarpet)
+fi
+source /a/bin/distro-functions/src/package-manager-abstractions
pi ${pkgs[@]}
+if $deb8; then
+ sudo gem install redcarpet
+fi
chmod og+x _site/on2vote/vote.py
@@ -51,11 +109,11 @@ chmod og+x _site/on2vote/vote.py
# It's example apache config seems to say we can use cgi or cgid,
# and googling cgid it seems a newer faster alternative. I also
# depend on this in my o(n^2) python script.
-sudo a2enmod cgid
+$s a2enmod cgid
# additional settings from browsing https://git-scm.com/docs/gitweb.conf
-s dd of=/etc/gitweb.conf <
# to run python scripts with cgi
@@ -92,6 +152,11 @@ apache-site - $domain <
+
+ Options Indexes
+
+
+
Options +ExecCGI
SetHandler cgi-script
@@ -150,4 +215,5 @@ EOF
$script_dir/gitweb-descriptions $gitroot
$script_dir/build.rb
-s lnf -T $script_dir/_site /var/www/$domain/html
+$s rm -rf /var/www/$domain/html
+$s ln -sT $script_dir/_site /var/www/$domain/html