X-Git-Url: https://iankelling.org/git/?p=iankelling.org;a=blobdiff_plain;f=setup.sh;h=3f73cfa8f5a3de5fbd347529cd4dc346eb2a000d;hp=a68c4fc7e0a6ff9d10ba02e417a637cc0ff57d37;hb=0f82eb11023889fb0210c8c26bb239c949fce444;hpb=6ae93360501151f3625f6d988cee7047b7acc786
diff --git a/setup.sh b/setup.sh
index a68c4fc..3f73cfa 100755
--- a/setup.sh
+++ b/setup.sh
@@ -14,8 +14,6 @@
# 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
@@ -28,6 +26,10 @@ Setup dependencies, apache, and gitweb. Then call build.rb.
Default DOMAIN_NAME is iankelling.org. Domain is expected to resolve
so we can get a let's encrypt cert.
+This script depends on a few other git repos of mine: distro-functions
+and basic-https-conf.
+
+
-p PORT Apache port, default is 443.
-h|--help Print help and exit.
@@ -72,10 +74,9 @@ shopt -s extglob
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-sass
@@ -138,7 +139,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