diff options
| author | Matt Rude <[email protected]> | 2019-06-30 18:10:07 -0500 |
|---|---|---|
| committer | Matt Rude <[email protected]> | 2019-06-30 18:10:07 -0500 |
| commit | 93bd462a1cb30c56efe4558b707422faf37749af (patch) | |
| tree | aaeaf7191c051009db222f84bbcc1e1e165b1a41 | |
| parent | d7168adbbf24072e8632eb3a3ecd600dcda7a255 (diff) | |
| download | xmpp-site-lite-93bd462a1cb30c56efe4558b707422faf37749af.tar.gz xmpp-site-lite-93bd462a1cb30c56efe4558b707422faf37749af.tar.bz2 xmpp-site-lite-93bd462a1cb30c56efe4558b707422faf37749af.zip | |
Correct a few CSS issues.
| -rw-r--r-- | _config.yml | 2 | ||||
| -rw-r--r-- | _includes/about.html | 6 | ||||
| -rw-r--r-- | _sass/site.scss | 4 | ||||
| -rw-r--r-- | privacy-policy.md | 2 | ||||
| -rwxr-xr-x | site-updater.sh | 3 |
5 files changed, 13 insertions, 4 deletions
diff --git a/_config.yml b/_config.yml index f3eee12..0cb9a61 100644 --- a/_config.yml +++ b/_config.yml @@ -7,6 +7,7 @@ url: "https://im.example.com" name: "example.com" baseurl: "im.example.com" destination: "/var/www/im.example.com" +system-version: "16.04 LTS" owner-name: "Matt Rude" owner-pgpkey: "0x94c32ac158aea35c" @@ -77,6 +78,7 @@ date: YYYY-MM-DD HH:MM include: - .well-known/host-meta +- .well-known/host-meta.json exclude: - README.md diff --git a/_includes/about.html b/_includes/about.html index 19d8079..5862dd4 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -1,6 +1,6 @@ <div id="feature-about" style=""> <div class="container offsetanchor"> - <div class="section-headder"><center><span class="fas fa-info-circle" style="font-size:80px;" aria-hidden="true"></span><h1>About</h1></center></div> + <div class="section-header"><center><span class="fas fa-info-circle" style="font-size:80px;" aria-hidden="true"></span><h1>About</h1></center></div> <div class="col-md-5 float-right"> <h2>Contact Information</h2> <p>{% if site.owner-name %}This site is maintained by Matt Rude{% if site.owner-pgpkey %} (<a href="https://mattrude.com/keys/{{ site.owner-pgpkey }}.asc" target="_blank">{{ site.owner-pgpkey }}</a>){% endif %}. {% endif %}If you would like to report any problems or bugs, please send a email or XMPP messsage to the email address listed in one of my public keys.</p> @@ -12,7 +12,7 @@ {% if site.owner-url %}<li class="list-inline"><b><a href=" {{ site.owner-url }}" title="Website" target="_blank"><i class="fas fa-link"></i></a></b></li>{% endif %} {% if site.owner-pgpkey %}<li class="list-inline"><b><a href="https://mattrude.com/keys/{{ site.owner-pgpkey }}.asc" title="PGP Public Key" target="_blank"><i class="fas fa-key"></i></a></b></li>{% endif %} </ul> - <p><small>Pleasee see my <a href="https://mattrude.com/contact.txt">contact.txt</a> file for my current <a href="https://conversations.im/omemo/">omemo</a> keys.</small></p> + <p><small>See my <a href="https://mattrude.com/contact.txt" target="_blank">contact.txt</a> file for my <a href="https://conversations.im/omemo/" target="_blank">omemo</a> keys.</small></p> <hr /> <p style="text-align:center;"> <!-- IPv6-test.com button BEGIN --> @@ -24,7 +24,7 @@ <h2 id="this-service">This Service</h2> <p>This service is running a clustered configuration, of two servers, running <a href="https://www.ejabberd.im/" target="_blank">ejabberd</a> version <a href="https://github.com/processone/ejabberd/commits/{{ site.ejabberd-gitversion }}" target="_blank">{{ site.ejabberd-version }}</a> on - <a href="http://www.ubuntu.com/" target="_blank">Ubuntu</a> version 18.04 LTS. + <a href="http://www.ubuntu.com/" target="_blank">Ubuntu</a> version {{ site.system-version }}. The source code for ejabberd may be found on github in the <a href="https://github.com/processone/ejabberd" target="_blank">processone/ejabberd</a> repository. The program ejabberd is licensed under the diff --git a/_sass/site.scss b/_sass/site.scss index c16786c..4f4c6e9 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -192,6 +192,10 @@ pre { } } +div.section-header { + padding-bottom: 40px; +} + #server-features-content { .section-header { padding-bottom: 25px; diff --git a/privacy-policy.md b/privacy-policy.md index b7a9b85..13d7cee 100644 --- a/privacy-policy.md +++ b/privacy-policy.md @@ -4,7 +4,7 @@ title: Privacy Policy permalink: /privacy-policy/ --- -<div class="section-headder" id="{{ section.slug }}"><center><span class="fa fa-book" style="font-size:80px;" aria-hidden="true"></span><h1>Privacy Policy</h1></center></div> +<div class="section-header" id="{{ section.slug }}"><center><span class="fa fa-book" style="font-size:80px;" aria-hidden="true"></span><h1>Privacy Policy</h1></center></div> The servers general policy regarding data is to save as much as needed and as little as possible. This document will try to explain what personal data is store and how it is handled. diff --git a/site-updater.sh b/site-updater.sh index 288043c..2a2c9b4 100755 --- a/site-updater.sh +++ b/site-updater.sh @@ -3,6 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" VERSION=`ejabberdctl status |tail -1 |awk '{ print $2 }'` GITVERSION=`git --git-dir=/var/src/ejabberd/.git log |head -1 |awk '{print $2}'` +SYSVERSION=`lsb_release -a 2> /dev/null |grep 'Release:' |awk '{ print $2 }'` UPLOADDAYS=`grep -A1 mod_http_upload_quota /etc/ejabberd/ejabberd.yml |grep max_days |awk '{ print $2 }'` UPLOADFSIZ=`grep -A8 "mod_http_upload:$" /etc/ejabberd/ejabberd.yml |grep max_size |awk '{ print $2 }' |awk '{ byte =$1 /1024/1024/1024; print byte " GB" }'` DOMAINS=`sed -n -e '/^hosts:/,/^##/ p' /etc/ejabberd/ejabberd.yml |grep "^ -" |awk '{ print $2 }' |sed 's/"//g'` @@ -16,6 +17,7 @@ do 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 sed -i "s/^ejabberd-upload-fsize.*/ejabberd-upload-fsize: \"${UPLOADFSIZ}\"/g" current-config.yml + sed -i "s/^system-version.*/system-version: \"${SYSVERSION}\"/g" current-config.yml if [ -x ${DIR}/update-site-certs.sh ]; then ${DIR}/update-site-certs.sh ${DOMAIN} else @@ -25,6 +27,7 @@ do rm -rf /var/www/im.${DOMAIN} && \ if [ ! -f Gemfile.lock ]; then bundle install; fi && \ bundle exec jekyll build -c current-config.yml -q + mv /var/www/im.${DOMAIN}/well-known /var/www/im.${DOMAIN}/.well-known chown -R www-data:www-data /var/www/im.${DOMAIN} rm -rf /var/www/im.${DOMAIN}/files ${DIR}/current-config.yml done |