X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=web-conf;h=eb87f17d93670d7b8903495dfebb5eff99c58531;hb=6d16d596ac0b53c22151c4a298e26735dd79e635;hp=977c8cfb38166ec6099e56999502594eb159c50d;hpb=26e797e8fd4117747ec1bf1246286fa6f6f402c6;p=basic-https-conf
diff --git a/web-conf b/web-conf
index 977c8cf..eb87f17 100755
--- a/web-conf
+++ b/web-conf
@@ -1,17 +1,21 @@
#!/bin/bash
-# Copyright (C) 2016 Ian Kelling
+# This file is part of web-conf which configures web servers
+# Copyright (C) 2024 Ian Kelling
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
-# http://www.apache.org/licenses/LICENSE-2.0
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# SPDX-License-Identifier: GPL-3.0-or-later
[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
@@ -43,14 +47,19 @@ distro-setup, and log-quiet.
EXTRA_SETTINGS_FILE can be - for stdin
-a IPv4_ADDR IP address to listen on. Default all addresses.
ipv6 address support could be added to this script.
+-c CERT_FOLDER No letsencrypt. use fullchain.pem and privkey.pem in this folder.
-e EMAIL Contact address for let's encrypt. Default is
root@\$(hostname --fqdn')
which is root@$(hostname --fqdn) on this host.
-f [ADDR:]PORT Enable proxy to [ADDR:]PORT. ADDR default is 127.0.0.1
-i Insecure, no ssl.
+-l Allow failure of restarting apache/nginx. Useful for scripts where
+ we want to do the configuration, but don't mind if the web
+ server has some preexisting problem or other problem to fix later.
-p PORT Main port to listen on, default 443. 80 implies -i.
-r DIR DocumentRoot
--s Allow symlinks from the doucmentroot
+-s Allow symlinks from the doucment root
+-t No settings on documentroot.
-h|--help Print help and exit
Note: Uses GNU getopt options parsing style
@@ -64,8 +73,10 @@ symlinkarg=-
ssl=true
extra_settings=
port=443
-temp=$(getopt -l help a:e:if:p:r:sh "$@") || usage 1
+do_root_settings=true
+temp=$(getopt -l help a:c:e:if:lp:r:sth "$@") || usage 1
vhostip='*'
+allow_server_fail=false
eval set -- "$temp"
while true; do
case $1 in
@@ -73,11 +84,14 @@ while true; do
listenip="$2:"
vhostip="$2"
shift 2 ;;
+ -c) oob_cert_dir="$2"; shift 2 ;;
-e) email="$2"; shift 2 ;;
-f) proxy="$2"; shift 2 ;;
-i) ssl=false; shift ;;
+ -l) allow_server_fail=true; shift ;;
-p) port="$2"; shift 2 ;;
-r) root="$2"; shift 2 ;;
+ -t) do_root_settings=false; shift ;;
-s) symlinkarg=+; shift ;;
--) shift; break ;;
-h|--help) usage ;;
@@ -118,7 +132,11 @@ fi
##### end command line parsing ########
se=/etc/$t/sites-enabled
-cert_dir=/etc/letsencrypt/live/$h
+if [[ $oob_cert_dir ]]; then
+ cert_dir="$oob_cert_dir"
+else
+ cert_dir=/etc/letsencrypt/live/$h
+fi
mkdir -p $root
case $port in
@@ -138,7 +156,7 @@ if [[ $port == 80 ]]; then
fi
-if $ssl; then
+if [[ ! $oob_cert_dir ]] && $ssl; then
$this_dir/certbot-setup $t
@@ -196,10 +214,14 @@ if [[ $t == apache2 ]]; then
ServerName $h
ServerAlias www.$h
DocumentRoot $root
+EOF
+ if $do_root_settings; then
+ cat >>$vhost_file <
Options -Indexes ${symlinkarg}FollowSymlinks
EOF
+ fi
if [[ $extra_settings ]]; then
cat -- $extra_settings >>$vhost_file
@@ -333,7 +355,14 @@ EOF
a2enmod -q ssl rewrite # rewrite needed for httpredir
- service apache2 restart
+
+ if $allow_server_fail; then
+ if ! service apache2 restart; then
+ echo "$0: warning: apache2 restart failed. ignoring due to -l flag" >&2
+ fi
+ else
+ service apache2 restart
+ fi
# I rarely look at how much traffic I get, so let's keep that info
# around for longer than the default of 2 weeks.
@@ -397,11 +426,13 @@ EOF
listen [::]:$port $ssl_arg;
EOF
fi
- cat >>$vhost_file <>$vhost_file <>$vhost_file <&2
+ fi
+ else
+ service nginx restart
+ fi
fi ####### end if nginx