X-Git-Url: https://iankelling.org/git/?p=iankelling.org;a=blobdiff_plain;f=setup.sh;h=cd4dfaa3358e99e49435790293423e9c06551e52;hp=a68c4fc7e0a6ff9d10ba02e417a637cc0ff57d37;hb=35dea67c2f972fe7552820841f7c550129a6add0;hpb=6ae93360501151f3625f6d988cee7047b7acc786

diff --git a/setup.sh b/setup.sh
index a68c4fc..cd4dfaa 100755
--- a/setup.sh
+++ b/setup.sh
@@ -14,20 +14,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# 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
+source /a/bin/errhandle/err
 
 usage() {
     cat <<EOF
-Usage: ${0##*/} [OPTIONS] [DOMAIN_NAME]
+Usage: ${0##*/} [OPTIONS] [DOMAIN_NAME] [LETSENCRYPT_EMAIL]
 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.
 
@@ -57,6 +57,10 @@ script_dir=${x%/*}
 cd $script_dir
 
 domain=${1:-iankelling.org} # use argument for testing site
+email=$2
+if [[ $email ]]; then
+  email_arg="-e $email"
+  fi
 gitroot=/a/bin/githtml
 
 if [[ $EUID != 0 ]]; then
@@ -72,10 +76,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 +141,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
 our \$projects_list_group_categories = 1;
 EOF
 
-apache-site -p $port - $domain <<EOF
+web-conf $email_arg -p $port - apache2 $domain <<EOF
 # to run python script on my site:
 <Directory /var/www/$domain/html/on2vote>
   # to run python scripts with cgi