From 656c0ee55ce70a1662524dae331a169889b91429 Mon Sep 17 00:00:00 2001 From: Matt Rude Date: Wed, 30 Jan 2019 15:23:57 -0600 Subject: more updates --- _config.yml | 4 ++-- site-updater.sh | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/_config.yml b/_config.yml index 801c539..7632f15 100644 --- a/_config.yml +++ b/_config.yml @@ -10,8 +10,8 @@ destination: "/var/www/im.example.com" owner-name: "Matt Rude" owner-pgpkey: "0xc4909ee495b0761f" -owner-url: "https://example.com/" -owner-xmpp: "matt@example.com" +owner-url: "https://mattrude.com/" +owner-xmpp: "matt@mattrude.com" owner-twitter: "mdrude" owner-github: "mattrude" diff --git a/site-updater.sh b/site-updater.sh index d5c3c47..8a9e83f 100755 --- a/site-updater.sh +++ b/site-updater.sh @@ -11,11 +11,7 @@ for DOMAIN in ${DOMAINS} do cd ${DIR} rm -f current-config.yml - if [ "${DOMAIN}" != "mattrude.com" ]; then - sed "s/mattrude.com/${DOMAIN}/g" _config.yml |sed "s/matt@${DOMAIN}/matt@mattrude.com/g" > current-config.yml - else - cp _config.yml current-config.yml - fi + sed "s/example.com/${DOMAIN}/g" _config.yml |sed "s/matt@${DOMAIN}/matt@mattrude.com/g" > current-config.yml sed -i "s/^ejabberd-version.*/ejabberd-version: \"${VERSION}\"/g" current-config.yml sed -i "s/^ejabberd-gitversion.*/ejabberd-gitversion: \"${GITVERSION}\"/g" current-config.yml sed -i "s/^ejabberd-upload-days.*/ejabberd-upload-days: \"${UPLOADDAYS}\"/g" current-config.yml @@ -29,7 +25,7 @@ do rm -rf /var/www/im.${DOMAIN} && \ 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 + rm -rf /var/www/im.${DOMAIN}/files ${DIR}/current-config.yml done if [ -x /etc/ejabberd/bin/update-tlsa.sh ]; then /etc/ejabberd/bin/update-tlsa.sh; fi -- cgit v1.2.3-59-ga6da