aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Rude <[email protected]>2019-01-30 15:23:57 -0600
committerMatt Rude <[email protected]>2019-01-30 15:23:57 -0600
commit656c0ee55ce70a1662524dae331a169889b91429 (patch)
treef280cf0a8fc8421023e281ebce73e987ce56d887
parentad6d9ebd7043f6a9f5bbce64f5f750b30873458a (diff)
downloadxmpp-site-lite-656c0ee55ce70a1662524dae331a169889b91429.tar.gz
xmpp-site-lite-656c0ee55ce70a1662524dae331a169889b91429.tar.bz2
xmpp-site-lite-656c0ee55ce70a1662524dae331a169889b91429.zip
more updates
-rw-r--r--_config.yml4
-rwxr-xr-xsite-updater.sh8
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: "[email protected]"
+owner-url: "https://mattrude.com/"
+owner-xmpp: "[email protected]"
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}/[email protected]/g" > current-config.yml
- else
- cp _config.yml current-config.yml
- fi
+ sed "s/example.com/${DOMAIN}/g" _config.yml |sed "s/matt@${DOMAIN}/[email protected]/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