summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-09-04 19:35:32 -0400
committerAndrew Cady <d@jerkface.net>2020-09-04 19:37:03 -0400
commit6ed920949b4ce2660228c4acc0c4e35f83f0d800 (patch)
tree98e436380b2707527cdfbee854f04ea9ec91c5cd
parent9055dfb6bf8cfc44b7c079b66445956668f42263 (diff)
add fortune
-rw-r--r--selfpublish.sh17
1 files changed, 15 insertions, 2 deletions
diff --git a/selfpublish.sh b/selfpublish.sh
index 6bd4a88..1029e7f 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -51,7 +51,7 @@ control_file()
51{ 51{
52 cat <<EOF 52 cat <<EOF
53Package: selfpublish-dot-sh-deps 53Package: selfpublish-dot-sh-deps
54Depends: apache2 (>= 2.4.46), libssl1.1 (>= 1.1.1d) 54Depends: apache2 (>= 2.4.46), libssl1.1 (>= 1.1.1d), fortune
55Description: selfpublish.sh dependency package 55Description: selfpublish.sh dependency package
56 This package depends on the dependencies of the 56 This package depends on the dependencies of the
57 selfpublish.sh script, and is installed by that 57 selfpublish.sh script, and is installed by that
@@ -237,6 +237,18 @@ install_self_to_site()
237 fi 237 fi
238} 238}
239 239
240install_header_to_site()
241{
242 cat > "$SITE_DIR"/public_html/HEADER.html <<EOF
243<pre style=font-size:1.3em>
244Fortunately,
245
246<!--#exec cmd="/usr/games/fortune |sed 's/^/ /'" -->
247</pre>
248EOF
249 chmod +x "$SITE_DIR"/public_html/HEADER.html
250}
251
240check_tls() 252check_tls()
241{ 253{
242 curl -s -S -I https://"$1" >/dev/null 254 curl -s -S -I https://"$1" >/dev/null
@@ -244,7 +256,7 @@ check_tls()
244 256
245equivocate 257equivocate
246 258
247APACHE_MODULES='status md rewrite ssl include' 259APACHE_MODULES='status md rewrite ssl include cgi'
248APACHE_SITE_DIRS='logs public_html' 260APACHE_SITE_DIRS='logs public_html'
249 261
250AUTH_TYPE=$(path_fragment_to_ssh_keytag "${1:-$DEFAULT_AUTH_TYPE}") 262AUTH_TYPE=$(path_fragment_to_ssh_keytag "${1:-$DEFAULT_AUTH_TYPE}")
@@ -271,6 +283,7 @@ then
271 systemctl reload apache2 || systemctl restart apache2 283 systemctl reload apache2 || systemctl restart apache2
272else 284else
273 install_self_to_site 285 install_self_to_site
286 install_header_to_site
274fi 287fi
275 288
276check_tls "$DOMAIN" 289check_tls "$DOMAIN"