minor improvements

[iankelling.org] / setup.sh

diff --git a/setup.sh b/setup.sh
index ed295eb9172a36a04973c8458da522565c2a4c47..cd4dfaa3358e99e49435790293423e9c06551e52 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -14,13 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-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
@@ -59,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
@@ -74,6 +76,7 @@ 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
 
 
 pkgs=(
@@ -138,7 +141,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
 our \$projects_list_group_categories = 1;
 EOF
 
-web-conf -p $port - apache2 $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