diff options
| author | Matt Rude <[email protected]> | 2019-02-03 22:38:40 -0600 |
|---|---|---|
| committer | Matt Rude <[email protected]> | 2019-02-03 22:38:40 -0600 |
| commit | 54841c50eb701cf1d0d4dc0fecca503023983e00 (patch) | |
| tree | 59b75f98f49eda9bd1d213b924d0025b737ba492 | |
| parent | 3b6beb25a7ac950f435f4f6a299b4c741e9d2481 (diff) | |
| download | xmpp-site-lite-54841c50eb701cf1d0d4dc0fecca503023983e00.tar.gz xmpp-site-lite-54841c50eb701cf1d0d4dc0fecca503023983e00.tar.bz2 xmpp-site-lite-54841c50eb701cf1d0d4dc0fecca503023983e00.zip | |
minor site updates
| -rwxr-xr-x | site-updater.sh | 1 | ||||
| -rwxr-xr-x | update-site-certs.sh | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/site-updater.sh b/site-updater.sh index 3fb039b..288043c 100755 --- a/site-updater.sh +++ b/site-updater.sh @@ -23,6 +23,7 @@ do fi cd ${DIR} && \ rm -rf /var/www/im.${DOMAIN} && \ + if [ ! -f Gemfile.lock ]; then bundle install; fi && \ bundle exec jekyll build -c current-config.yml -q chown -R www-data:www-data /var/www/im.${DOMAIN} rm -rf /var/www/im.${DOMAIN}/files ${DIR}/current-config.yml diff --git a/update-site-certs.sh b/update-site-certs.sh index f18a83c..a884e89 100755 --- a/update-site-certs.sh +++ b/update-site-certs.sh @@ -2,14 +2,19 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" CONFIG="current-config.yml" -DOMAIN="$1" +if [ ${1} ]; then + DOMAIN="$1" +else + echo "Domain name is required" + exit 1 +fi cd ${DIR} #for DOMAIN in mattrude.com soderparr.com therudes.com #do ### ### The Primary Cert Tests ### - DOMAINFL="im.${DOMAIN}" + #DOMAIN="im.${DOMAINS}" if [ -f /etc/ejabberd/certs/$DOMAIN/fullchain.pem ]; then if [ `openssl x509 -noout -text -in /etc/ejabberd/certs/${DOMAIN}/fullchain.pem |grep "DNS:$DOMAIN" |wc -l` -gt 0 ]; then EXPIRES=`openssl x509 -noout -text -in /etc/ejabberd/certs/${DOMAIN}/fullchain.pem |grep "Not After : " |sed 's/ Not After : /fingerprint-expires: "/g' |sed 's/$/"/g'` @@ -21,6 +26,7 @@ cd ${DIR} SHA256='fingerprint-sha256: "No Key Found"' fi else + ls /etc/ejabberd/certs/${DOMAIN}/fullchain.pem if [ -f /etc/ejabberd/certs/${DOMAIN}/fullchain.pem ]; then if [ `openssl x509 -noout -text -in /etc/ejabberd/certs/${DOMAIN}/fullchain.pem |grep "DNS:$DOMAIN" |wc -l` -gt 0 ]; then EXPIRES=`openssl x509 -noout -text -in /etc/ejabberd/certs/${DOMAIN}/fullchain.pem |grep "Not After : " |sed 's/ Not After : /fingerprint-expires: "/g' |sed 's/$/"/g'` @@ -33,7 +39,7 @@ cd ${DIR} fi fi fi - sed -i "/fingerprint-expires/c$EXPIRES" ${CONFIG} + sed -i "/fingerprint-expires/c${EXPIRES}" ${CONFIG} sed -i "/fingerprint-sha1/c$SHA1" ${CONFIG} sed -i "/fingerprint-sha256/c$SHA256" ${CONFIG} |