X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=setup.sh;h=cd4dfaa3358e99e49435790293423e9c06551e52;hb=HEAD;hp=5aaf019c160b1f6d36124994d4a6c114fb949648;hpb=3da8c7ce9ed611cd12d48d5470db5725fa310f24;p=iankelling.org
diff --git a/setup.sh b/setup.sh
index 5aaf019..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
@@ -128,15 +134,17 @@ our \$site_footer = '$PWD/_site/gitweb-footer.html';
push @stylesheets, "/css/gitweb-site.css";
our \$favicon = '/assets/favicon.png';
# default is 25, cuts off descriptions.
-our \$projects_list_description_width = 40;
+our \$projects_list_description_width = 50;
# a bit superflous since they are all me
our \$omit_owner = true;
# highlight scripts with no extension, uses a patch
# that is on it's way upstream.
our \$highlight_force = 1;
+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
@@ -144,6 +152,11 @@ apache-site -p $port - $domain <
+
+ Options Indexes
+
+
+
Options +ExecCGI
SetHandler cgi-script