iankelling.org
/
git
/
iankelling.org
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements
[iankelling.org]
/
setup.sh
diff --git
a/setup.sh
b/setup.sh
index 8e8e259ab6a9d41d602bb261c9f3e2d34bc134ab..cd4dfaa3358e99e49435790293423e9c06551e52 100755
(executable)
--- a/
setup.sh
+++ b/
setup.sh
@@
-14,21
+14,21
@@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# 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() {
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.
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.
--p PORT Apache port, default is *:443.
+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.
Note: Uses GNU getopt options parsing style
-h|--help Print help and exit.
Note: Uses GNU getopt options parsing style
@@
-38,7
+38,7
@@
EOF
##### begin command line parsing ########
##### begin command line parsing ########
-port=
"*:443"
+port=
443
temp=$(getopt -l help, p:h "$@") || usage 1
eval set -- "$temp"
while true; do
temp=$(getopt -l help, p:h "$@") || usage 1
eval set -- "$temp"
while true; do
@@
-57,6
+57,10
@@
script_dir=${x%/*}
cd $script_dir
domain=${1:-iankelling.org} # use argument for testing site
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
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 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
pkgs=(
# build.rb dependencies
ruby-pygments.rb ruby-safe-yaml ruby-sass
@@
-128,15
+131,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.
push @stylesheets, "/css/gitweb-site.css";
our \$favicon = '/assets/favicon.png';
# default is 25, cuts off descriptions.
-our \$projects_list_description_width =
4
0;
+our \$projects_list_description_width =
5
0;
# 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;
# 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
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
# to run python script on my site:
<Directory /var/www/$domain/html/on2vote>
# to run python scripts with cgi