Updates

author: Matt Rude <[email protected]> 2018-08-03 16:17:02 -0500
committer: Matt Rude <[email protected]> 2018-08-03 16:17:02 -0500
commit: 1e376c658c68ab57ce87ad853ffae45ade10eb6a (patch)
tree: ef193cadb7098cd47e43cb26b71a1f4e6c437d64
parent: 72e516528be8275fec0badf588315601e2514216 (diff)
download: xmpp-site-lite-1e376c658c68ab57ce87ad853ffae45ade10eb6a.tar.gz
xmpp-site-lite-1e376c658c68ab57ce87ad853ffae45ade10eb6a.tar.bz2
xmpp-site-lite-1e376c658c68ab57ce87ad853ffae45ade10eb6a.zip
8 files changed, 76 insertions, 75 deletions
diff --git a/_config.yml b/_config.yml
index b84e3f1..86e0196 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,56 +6,54 @@ url: "https://im.soderparr.com"
 name: "soderparr.com"
 baseurl: "soderparr.com"
 destination: "/var/www/im.soderparr.com"
-prosody-version: "0.10"
-register-web: 2
-password-reset: 1
-user-guide: 0
-color: "#9FCF6C"
-#color: "#c3950d"
-recaptcha_public_key: "6LdJkzUUAAAAAFj3M0bgNhwzoPuPoiYdlbVaWBf-"
+ejabberd-version: "18.06.92"
+ejabberd-gitversion: "c9ba0e83d28866f3b2cd47291b3e403e3ad2eadc"
+prosody-version:
 
-owner_name: "Matt Rude"
-owner_pgpkey: "0xc4909ee495b0761f"
+owner-name: "Matt Rude"
+owner-pgpkey: "0xc4909ee495b0761f"
+owner-url: "https://mattrude.com/"
+owner-xmpp: "[email protected]"
+owner-email: "[email protected]"
+owner-twitter: "mdrude"
+owner-github: "mattrude"
 
 xmpp-url: "soderparr.com" # The domain name of the XMPP service
 xmpp-host: "im.soderparr.com"
 xmpp-conference-url: "conference.soderparr.com" # The domain name of the conference XMPP service
 xmpp-proxy-url: "proxy.soderparr.com" # XEP-0065: SOCKS5 Bytestreams (Proxy)
 xmpp-upload-url: "upload.soderparr.com" # XEP-0065: SOCKS5 Bytestreams (Proxy)
+user-guide: 0
 
-xep-0030: 1 # Service Discovery
-xep-0045: 1 # Multi-User Chat
-xep-0065: 1 # SOCKS 5 Bytestreams (Proxy)
-xep-0115: 1 # Entity Capabilities
 xep-0163: 1 # Personal Eventing Protocal
-xep-0191: 1 # Blocking Command
-xep-0198: 1 # Stream Management
 xep-0237: 1 # Roster Versioning
 xep-0280: 1 # Message Carbons
+xep-0191: 1 # Blocking Command
+xep-0045: 1 # Multi-User Chat
+xep-0198: 1 # Stream Management
 xep-0313: 1 # Message Archive Management
 xep-0352: 1 # Client State Indication
-xep-0357: 1 # Push Notifications
 xep-0363: 1 # HTTP File Upload
-xep-0368: 1 # SRV records for XMPP over TLS
-xep-0384: 1 # OMEMO Encryption
-xep-0387: 1 # XMPP Compliance Suites 2017
+xep-0065: 1 # SOCKS 5 Bytestreams (Proxy)
+xep-0357: 1 # Push Notifications
+xep-0375: 0 # XMPP protocol compliance levels for 2016
 
 fingerprints: 1
-fingerprint-expires: "Apr 30 00:01:14 2018 GMT"
-fingerprint-im-expires: "Mar 11 07:10:22 2018 GMT"
-fingerprint-conference-expires: "Mar 11 07:10:22 2018 GMT"
-fingerprint-proxy-expires: "Mar 11 07:10:22 2018 GMT"
-fingerprint-upload-expires: "Mar 11 07:10:22 2018 GMT"
-fingerprint-sha1: "5E:F9:B5:77:C3:26:3F:E5:A7:D0:33:65:EC:DC:7E:D2:20:26:1B:D4"
-fingerprint-sha256: "8F:7D:29:8D:95:A7:87:32:49:13:CB:9C:38:46:6D:7A:AD:D0:B3:DD:78:A2:38:72:52:AE:75:7C:81:31:44:EF"
-fingerprint-im-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
-fingerprint-im-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
-fingerprint-conference-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
-fingerprint-conference-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
-fingerprint-proxy-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
-fingerprint-proxy-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
-fingerprint-upload-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
-fingerprint-upload-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
+fingerprint-expires: "Oct 28 01:33:36 2018 GMT"
+fingerprint-im-expires: "Oct 5 23:58:39 2018 GMT"
+fingerprint-conference-expires: "Oct 5 23:58:39 2018 GMT"
+fingerprint-proxy-expires: "Oct 5 23:58:39 2018 GMT"
+fingerprint-upload-expires: "Oct 5 23:58:39 2018 GMT"
+fingerprint-sha1: "86:F5:09:0F:B0:E5:0E:3C:11:DB:05:5B:C2:EE:03:98:43:40:32:AE"
+fingerprint-sha256: "2B:88:B6:C5:6F:E2:9B:78:D1:B2:C6:E3:39:51:2F:75:3B:25:3D:67:40:5F:73:7F:7D:54:4C:D2:EC:4A:C1:AC"
+fingerprint-im-sha1: "B3:BA:B5:9E:2E:62:42:96:5D:6D:C5:FA:25:83:D7:3D:5C:55:62:23"
+fingerprint-im-sha256: "E3:84:90:78:FA:1A:85:CC:0F:73:BA:81:E1:01:2A:F4:89:06:68:F1:E7:50:67:C7:04:F5:5C:5C:50:EF:9A:ED"
+fingerprint-conference-sha1: "B3:BA:B5:9E:2E:62:42:96:5D:6D:C5:FA:25:83:D7:3D:5C:55:62:23"
+fingerprint-conference-sha256: "E3:84:90:78:FA:1A:85:CC:0F:73:BA:81:E1:01:2A:F4:89:06:68:F1:E7:50:67:C7:04:F5:5C:5C:50:EF:9A:ED"
+fingerprint-proxy-sha1: "B3:BA:B5:9E:2E:62:42:96:5D:6D:C5:FA:25:83:D7:3D:5C:55:62:23"
+fingerprint-proxy-sha256: "E3:84:90:78:FA:1A:85:CC:0F:73:BA:81:E1:01:2A:F4:89:06:68:F1:E7:50:67:C7:04:F5:5C:5C:50:EF:9A:ED"
+fingerprint-upload-sha1: "B3:BA:B5:9E:2E:62:42:96:5D:6D:C5:FA:25:83:D7:3D:5C:55:62:23"
+fingerprint-upload-sha256: "E3:84:90:78:FA:1A:85:CC:0F:73:BA:81:E1:01:2A:F4:89:06:68:F1:E7:50:67:C7:04:F5:5C:5C:50:EF:9A:ED"
 
 # Analytics settings
 #google_analytics_id: UA-9532791-9
@@ -67,19 +65,19 @@ highlighter: rouge
 date: YYYY-MM-DD HH:MM
 
 exclude:
-- Gemfile
-- Gemfile.lock
 - README.md
 - CONTRIBUTING.md
 - LICENSE
+- css/syntax.less
+- css/site.less
+- css/small.less
 
-plugins:
+gems:
 - jekyll-sitemap
-- jekyll-minifier
-
-sass:
- style: compressed
+#- jekyll-press
 
-jekyll-minifier:
- exclude:
- - robots.txt
+jekyll-press:
+ exclude: 'robots.txt, contact.txt, contact-ecc.txt' # Exclude files from processing - file name, glob pattern or array of file names and glob patterns
+ js_options: {} # js minifier options
+ css_options: {} # css minifier options
+ html_options: {} # html minifier options
diff --git a/_includes/about.html b/_includes/about.html
index 6d2b120..5d56801 100644
--- a/_includes/about.html
+++ b/_includes/about.html
@@ -3,14 +3,14 @@
 <div class="section-headder"><center><span class="fa fa-info-circle" style="font-size:80px;" aria-hidden="true"></span><h1>About</h1></center></div>
 <div class="col-md-5 pull-right">
 <h2>Contact Information</h2>
- <p>This site is maintained by Matt Rude (<a href="https://keyserver.mattrude.com/d/0xc4909ee495b0761f" target="_blank">0xc4909ee495b0761f</a>). 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>
+ <p>{% if site.owner-name %}This site is maintained by Matt Rude{% if site.owner-pgpkey %} (<a href="https://keyserver.mattrude.com/d/0xc4909ee495b0761f" target="_blank">0xc4909ee495b0761f</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>
 <ul class="contact-list">
- <li class="list-inline"><b><a href="xmpp:[email protected]" title="XMPP/Jabber ID"><i class="fa fa-commenting"></i></a></b></li>
- <li class="list-inline"><b><a href="mailto:[email protected]" title="Email Address"><i class="fa fa-envelope"></i></a></b></li>
- <li class="list-inline"><b><a href="https://www.twitter.com/mdrude" title="Twitter Profile Page" target="_blank"><i class="fa fa-twitter-square"></i></a></b></li>
- <li class="list-inline"><b><a href="https://github.com/mattrude" title="Github Profile Page" target="_blank"><i class="fa fa-github"></i></a></b></li>
- <li class="list-inline"><b><a href="https://mattrude.com" title="Website" target="_blank"><i class="fa fa-link"></i></a></b></li>
- <li class="list-inline"><b><a href="https://keyserver.mattrude.com/search/vindex/hash/fingerprint/0xc4909ee495b0761f" title="PGP Public Key" target="_blank"><i class="fa fa-key"></i></a></b></li>
+ {% if site.owner-xmpp %}<li class="list-inline"><b><a href="xmpp:[email protected]" title="XMPP/Jabber ID"><i class="fa fa-commenting"></i></a></b></li>{% endif %}
+ {% if site.owner-email %}<li class="list-inline"><b><a href="mailto:[email protected]" title="Email Address"><i class="fa fa-envelope"></i></a></b></li>{% endif %}
+ {% if site.owner-twitter %}<li class="list-inline"><b><a href="https://www.twitter.com/mdrude" title="Twitter Profile Page" target="_blank"><i class="fa fa-twitter-square"></i></a></b></li>{% endif %}
+ {% if site.owner-github %}<li class="list-inline"><b><a href="https://github.com/mattrude" title="Github Profile Page" target="_blank"><i class="fa fa-github"></i></a></b></li>{% endif %}
+ {% if site.owner-url %}<li class="list-inline"><b><a href="https://mattrude.com" title="Website" target="_blank"><i class="fa fa-link"></i></a></b></li>{% endif %}
+ {% if site.owner-pgpkey %}<li class="list-inline"><b><a href="https://keyserver.mattrude.com/search/vindex/hash/fingerprint/0xc4909ee495b0761f" title="PGP Public Key" target="_blank"><i class="fa fa-key"></i></a></b></li>{% endif %}
 </ul>
 </div>
 <div class="col-md-7">
diff --git a/_includes/footer-error.html b/_includes/footer-error.html
index 8dfc2db..b31e0da 100644
--- a/_includes/footer-error.html
+++ b/_includes/footer-error.html
@@ -5,7 +5,7 @@
 <p><a href="https://status.im.mattrude.com/{{ site.xmpp-url }}">Status</a> | <a href="{{ site.url }}/certificates/">Certificates</a></p>
 </div>
 <div class="pull-right">
- <p>&copy; {{ site.time | date: "%Y" }} by <a href="{{ site.owner-url }}">{{ site.owner_name }}</a></p>
+ <p>&copy; {{ site.time | date: "%Y" }} by <a href="{{ site.owner-url }}">{{ site.owner-name }}</a></p>
 </div>
 </div><!-- Closing Footer Section -->
 </div><!-- Closing Menu Section (from header) -->
diff --git a/_includes/footer.html b/_includes/footer.html
index f845bf0..222ba66 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,7 +5,7 @@
 <p><a href="https://status.im.mattrude.com/{{ site.xmpp-url }}">Status</a> | <a href="{{ site.url }}/certificates/">Certificates</a></p>
 </div>
 <div class="pull-right">
- <p>&copy; {{ site.time | date: "%Y" }} by <a href="{{ site.owner-url }}">{{ site.owner_name }}</a></p>
+ <p>&copy; {{ site.time | date: "%Y" }} by <a href="{{ site.owner-url }}">{{ site.owner-name }}</a></p>
 </div>
 </div><!-- Closing Footer Section -->
 </div><!-- Closing Menu Section (from header) -->
diff --git a/_includes/menu.html b/_includes/menu.html
index cb2b218..7d2e249 100644
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -8,14 +8,14 @@
 <div class="collapse navbar-collapse" id="navbarCollapse">
 <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">{% if page.url == "/" %}
 <li class="nav-item"><a class="nav-link" href="#home">Home</a></li>{% if site.register-web == 2 %}
- <li class="nav-item"><a class="nav-link" href="#register">Register</a></li>{% endif %}
+ <li class="nav-item"><a class="nav-link" href="#register">Register</a></li>{% endif %}{% if site.server-features == 1 %}
 <li class="nav-item"><a class="nav-link" href="#server-features">Server Features</a></li>
 <nav class="nav nav-pills flex-column" style="display:none;">
 <a id="server-features-index-a"class="nav-link ml-3 my-1" href="#features"><b>Server Features</b></a>
 {% for section in site.data.sections %}
 <a class="nav-link ml-3 my-1" href="#{{ section.slug }}">{{ section.name }}</a>
 {% endfor %}
- </nav>{% if site.user-guide == 1 %}
+ </nav>{% endif %}{% if site.user-guide == 1 %}
 <li class="nav-item"><a class="nav-link" href="#nug-opening">User Guide</a></li>
 <nav class="nav nav-pills flex-column" style="display:none;">
 {% for sectionnug in site.data.nug-sections %}
diff --git a/_includes/new_user_guide.html b/_includes/new_user_guide.html
index dc7aeb6..0b10548 100644
--- a/_includes/new_user_guide.html
+++ b/_includes/new_user_guide.html
@@ -1,26 +1,25 @@
 <div id="nug" class="container-fluid">
 <div class="row justify-content">
- <div id="nug-opening" class="feature-section">
- <div class="container offsetanchor">
- <div class="section-header" id="features-section">
- <center>
- <span class="fa fa-user"aria-hidden="true"></span>
- <h2>New User Guide</h2>
- </center>
- </div>
- <div id="feature-heading-content">
- <hr class="my-4">
- <p>This guide hopes to walk new users threw setting up and using XMPP.</p>
- <p>XMPP is not the simpliest why of chating, but its not difficalt to use either, once you have a server, it no harder then any other modern chat system.</p>
- <blockquote class="blockquote">
- <p class="mb-0"></p>
- </blockquote>
- </div>
- </div>
- </div>
-
 <!-- Starting the content section of the page -->
 <div id="nug-content" class="col-sm-10">
+ <div id="nug-opening" class="feature-section" style="background-color: rgba(0, 0, 0, 0.1);">
+ <div class="container offsetanchor">
+ <div class="section-header" id="features-section">
+ <center>
+ <span class="fa fa-user"aria-hidden="true"></span>
+ <h2>New User Guide</h2>
+ </center>
+ </div>
+ <div id="feature-heading-content">
+ <hr class="my-4">
+ <p>This guide hopes to walk new users threw setting up and using XMPP.</p>
+ <p>XMPP is not the simpliest why of chating, but its not difficalt to use either, once you have a server, it no harder then any other modern chat system.</p>
+ <blockquote class="blockquote">
+ <p class="mb-0"></p>
+ </blockquote>
+ </div>
+ </div>
+ </div>
 <!-- Site Features -->
 {% for section in site.data.nug-sections %}
 <div id="{{ section.slug }}" class="index-section nug-feature-section" style="background-color:#{{ section.color }};">
diff --git a/_sass/site.scss b/_sass/site.scss
index 9d61a44..035165b 100644
--- a/_sass/site.scss
+++ b/_sass/site.scss
@@ -222,6 +222,7 @@ pre {
 min-height:400px;
 width: 100%;
 padding-top: 80px;
+ padding-bottom: 50px;
 span {
 font-size: 100px;
 }
diff --git a/index.html b/index.html
index 70e91fa..f1d683d 100644
--- a/index.html
+++ b/index.html
@@ -71,6 +71,8 @@ permalink: /
 </div>
 {% endif %}
 
+
+{% if site.server-features == 1 %}
 <div id="server-features" class="container-fluid">
 <div class="row justify-content">
 <!-- Starting the page index nav menu -->
@@ -105,7 +107,7 @@ permalink: /
 <blockquote class="blockquote">
 <p class="mb-0">XMPP (<i>previous known as jabber</i>) is an <b>instant messaging</b> system that is <b>free</b>, <b>standard</b>,
 and <b>open</b>; allowing you to chat live with your family, friends and professional contacts, and be warned of
- the <b>presence</b> of your contacts, while keeping your <b>independence</b> vis-à vis-à-vis your software and
+ the <b>presence</b> of your contacts, while keeping your <b>independence</b> vis-à-vis your software and
 service providers.</p>
 </blockquote>
 <hr class="my-4">
@@ -156,6 +158,7 @@ permalink: /
 
 </div> <!-- Closing the row justify-content clases -->
 </div> <!-- Closing the ID creating-account and the main container class -->
+{% endif %}
 
 {% if site.user-guide == 1 %}
author	Matt Rude <[email protected]>	2018-08-03 16:17:02 -0500
committer	Matt Rude <[email protected]>	2018-08-03 16:17:02 -0500
commit	1e376c658c68ab57ce87ad853ffae45ade10eb6a (patch)
tree	ef193cadb7098cd47e43cb26b71a1f4e6c437d64
parent	72e516528be8275fec0badf588315601e2514216 (diff)
download	xmpp-site-lite-1e376c658c68ab57ce87ad853ffae45ade10eb6a.tar.gz xmpp-site-lite-1e376c658c68ab57ce87ad853ffae45ade10eb6a.tar.bz2 xmpp-site-lite-1e376c658c68ab57ce87ad853ffae45ade10eb6a.zip