updates

author: Matt Rude <[email protected]> 2018-01-22 13:48:16 -0600
committer: Matt Rude <[email protected]> 2018-01-22 13:48:16 -0600
commit: e755b64be38b1396a423bcd42d58f07bee67713a (patch)
tree: 678fb24834e09d76481acc19136c82c14d9a3e6f
parent: fe0ae7764a73598604c1c2207aea94288dc536ab (diff)
download: xmpp-site-builder-e755b64be38b1396a423bcd42d58f07bee67713a.tar.gz
xmpp-site-builder-e755b64be38b1396a423bcd42d58f07bee67713a.tar.bz2
xmpp-site-builder-e755b64be38b1396a423bcd42d58f07bee67713a.zip
12 files changed, 72 insertions, 31 deletions
diff --git a/_config.yml b/_config.yml
index b7247a9..8b9ba89 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,6 +12,8 @@ prosody-version: "0.10"
 owner_name: "Matt Rude"
 owner_pgpkey: "0xc4909ee495b0761f"
 
+register-web: 1
+
 xmpp-url: "mattrude.com" # The XMPP domain url
 xmpp-host: "im.mattrude.com" # The hostname of the server
 xmpp-conference-url: "conference.mattrude.com" # Multi-User Chat xep-0045
diff --git a/_includes/footer.html b/_includes/footer.html
index 560e9f4..df1a9b7 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -14,6 +14,6 @@
 </div>
 </body>
 <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>{% if page.url == "/files/register_web/register.html" %}
-<script src="https://raw.github.com/ReactiveRaven/jqBootstrapValidation/1.3.6/jqBootstrapValidation.js"></script><!-- This is the Register page, so we will add jqBootstrapValidation -->{% endif %}
+<script src="{{ site.url }}/assets/js/jqBootstrapValidation/1.3.6/jqBootstrapValidation.js"></script><!-- This is the Register page, so we will add jqBootstrapValidation -->{% endif %}
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 </html>
diff --git a/assets/css/main.css b/assets/css/main.css
index 8fe6a4c..fd0f7f8 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -34,6 +34,10 @@ td.FAILED {
 /* padding-top: 60px; */
 }
 
+#definitions h2 {
+ padding-top: 60px;
+}
+
 @media (max-width: 968px) {
 .pull-right, .pull-left {
 text-align: center;
diff --git a/contact-ecc.txt b/contact-ecc.txt
index c934a98..45ac312 100644
--- a/contact-ecc.txt
+++ b/contact-ecc.txt
@@ -15,6 +15,7 @@ websites, social media profiles, and PGP public keys and fingerprints.
 * Website: https://mattrude.com
 * Keyserver: https://keyserver.mattrude.com
 * Personal wiki: https://wiki.mattrude.com
+* XMPP IM Server: https://im.mattrue.com
 
 ## Social Media Profile
 
@@ -26,34 +27,49 @@ websites, social media profiles, and PGP public keys and fingerprints.
 
 ## Public Keys
 
-XMPP OMEMO Public fingerprints:
+You may use the below public keys for secure end-to-end encryption,
+depending on the system you are using. Use one of the OpenPGP keys for
+email comunication, and one of the OMEMO keys for XMPP Instant Messaging.
+
+### XMPP OMEMO Public fingerprints:
 
+Phone (Primary) (2017-06-07)
+
 2211712a f24bfcaa 3c078673 e493ce03
 2b8bb3df 8e6d727d 813b5234 f148b219
 
+Tablet (2017-07-08)
+
 a4b88aca f63e1f05 6f8fd700 7847baf3
 3f653098 64d478a7 d7387c88 fd8fb834
 
+Laptop (2016-12-02)
+
 776DCE9B 34AFFC32 4E5CACAA D6AA7DBC
 A9DF8BF4 E3D6C4FC 188850EC 0D9EC30B
 
-RSA OpenPGP Key information:
+### OpenPGP Keys for email:
+
+Both email address; [email protected] & [email protected],
+go to the same place.
+
+#### RSA OpenPGP Key information
 
 uid = Matt Rude <[email protected]>
 pub = rsa2048/95B0761F 2015-03-02
 sub = rsa2048/BC158061 2015-03-02
 fingerprint = 71FD 20E3 2815 8C32 2133 FBBE C490 9EE4 95B0 761F
 
-ECC OpenPGP Key information:
+#### ECC OpenPGP Key information
 
 uid = Matt Rude <[email protected]>
 pub = nistp256/03305F35 2015-02-15
 fingerprint = 77F1 D65B 5FF0 54DC 9286 6078 0314 CD85 0330 5F35
 
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
 
-iHUEARMIAB0WIQR38dZbX/BU3JKGYHgDFM2FAzBfNQUCWT7oaQAKCRADFM2FAzBf
-NUzfAP94JgUHuwxutShBvDQF7rdYnRWAvPkwnFFNDsk2FnWqJgD/babfR6Fe+ZcW
-SXa9HL0OHF9lOaLU259h9Y+yN1O8vgc=
-=gjoF
+iF4EARMIAAYFAlpK0UQACgkQAxTNhQMwXzWV6gD/RgvjdgnU4xSVVKuA2ovIyuAc
+/upcVZb3q0C3ciQTrtIA/jf54DOYqNN/0iSo/w8pcLeW9dNMF5zvxbIqM8j8KnkU
+=9aQU
 -----END PGP SIGNATURE-----
diff --git a/contact.txt b/contact.txt
index 55df24e..85eacbe 100644
--- a/contact.txt
+++ b/contact.txt
@@ -15,6 +15,7 @@ websites, social media profiles, and PGP public keys and fingerprints.
 * Website: https://mattrude.com
 * Keyserver: https://keyserver.mattrude.com
 * Personal wiki: https://wiki.mattrude.com
+* XMPP IM Server: https://im.mattrue.com
 
 ## Social Media Profile
 
@@ -26,38 +27,53 @@ websites, social media profiles, and PGP public keys and fingerprints.
 
 ## Public Keys
 
-XMPP OMEMO Public fingerprints:
+You may use the below public keys for secure end-to-end encryption,
+depending on the system you are using. Use one of the OpenPGP keys for
+email comunication, and one of the OMEMO keys for XMPP Instant Messaging.
+
+### XMPP OMEMO Public fingerprints:
 
+Phone (Primary) (2017-06-07)
+
 2211712a f24bfcaa 3c078673 e493ce03
 2b8bb3df 8e6d727d 813b5234 f148b219
 
+Tablet (2017-07-08)
+
 a4b88aca f63e1f05 6f8fd700 7847baf3
 3f653098 64d478a7 d7387c88 fd8fb834
 
+Laptop (2016-12-02)
+
 776DCE9B 34AFFC32 4E5CACAA D6AA7DBC
 A9DF8BF4 E3D6C4FC 188850EC 0D9EC30B
 
-RSA OpenPGP Key information:
+### OpenPGP Keys for email:
+
+Both email address; [email protected] & [email protected],
+go to the same place.
+
+#### RSA OpenPGP Key information
 
 uid = Matt Rude <[email protected]>
 pub = rsa2048/95B0761F 2015-03-02
 sub = rsa2048/BC158061 2015-03-02
 fingerprint = 71FD 20E3 2815 8C32 2133 FBBE C490 9EE4 95B0 761F
 
-ECC OpenPGP Key information:
+#### ECC OpenPGP Key information
 
 uid = Matt Rude <[email protected]>
 pub = nistp256/03305F35 2015-02-15
 fingerprint = 77F1 D65B 5FF0 54DC 9286 6078 0314 CD85 0330 5F35
 
 -----BEGIN PGP SIGNATURE-----
-
-iQEzBAEBCAAdFiEEcf0g4ygVjDIhM/u+xJCe5JWwdh8FAlk+6GgACgkQxJCe5JWw
-dh9U1Qf+ObUAik7hKd/6uoUMzj0b+58L1boUMaxrXiQrIrX8Zd142fuR6ZoHXLro
-0VEMtsVxIhqvEikQTEYNCxv8nyQQGX1Xhsn8Xdkumnm/v2HoV3FsuEt9B3XeHFXH
-232H5KM0lyK/a9miFDDgOOwDgyeWB2Ax1mtWnE0wHgmH9kranknm3Vu3TIK809Jp
-uO+rMTh59gRovRUmtOt06Bog7Up1YQ6d+KImUsw3rjMZJ0Vdd5vUsnYiSfb858Sl
-r8TfKPMJ0g1ZJB8tDv1CnVXA8Z9uiSyKp4Rmm4CtuzfbEggi/WDKj5JlJExJKOMc
-iq69Ke9F3WNE3Q/eQiJ7dmb4ipFLDA==
-=e5wW
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJaStFEAAoJEMSQnuSVsHYfOG0IAKQktaKBn2+qp1GDrD0KkW9Z
+UQPqymZbnbJd2Bk/Qce7OsQJmSS4A4DmUQIP91k8ajmSqpVY+c9XRXO7dAbhA3tm
+pH7FuYpbZQpKmBjKc7Q4+gGVwxqwWQ47tLI7syIJC52vnWKxU2Sp5czWxe7/G0A1
+pqQtzxlApxdVa0xaKPV/mP9XfDxVIqdT7/W/Glo4pqGFDWTt32SoNxp5zlygANKe
+XnLvyHc1RZKLy+7eW0fsAo0ToIZny/7ezXP36heE7wkt4BfPN0c0W5+7nGBmLqLW
+C5dxCwS8P9/attM+niXiFf2nwRYZZ6aP0N5pvIrD4X0zeJStrc6fBaTlDd/dbRE=
+=xkWC
 -----END PGP SIGNATURE-----
diff --git a/pages/about.md b/pages/about.md
index 724191e..ea5fe27 100644
--- a/pages/about.md
+++ b/pages/about.md
@@ -13,5 +13,5 @@ This server provides instant messaging service, via the XMPP protocol, to users
 This site is running [prosody](https://prosody.im) version {{ site.prosody-version }} on [Ubuntu](http://www.ubuntu.com/) version 16.04 LTS.. The source for prosody may be found at [hg.prosody.im](https://hg.prosody.im/). The program prosody is licensed under the [MIT/X11 license](https://prosody.im/source/mit).
 
 ## Site Source Locations
-The source for this website may be found in the github repository [xmpp-site](https://code.mattrude.com/xmpp-site/about/). The site is licensed under the [GNU General Public License, version 3 (GPLv3)](https://code.mattrude.com/xmpp-site/plain/LICENSE), and may be used or modified under the terms of that license.
+The source for this website may be found in the github repository [xmpp-site](https://github.com/mattrude/xmpp-site). The site is licensed under the [GNU General Public License, version 3 (GPLv3)](https://github.com/mattrude/xmpp-site/blob/master/LICENSE), and may be used or modified under the terms of that license.
 
diff --git a/pages/clients.html b/pages/clients.html
index 61580ab..59987d9 100644
--- a/pages/clients.html
+++ b/pages/clients.html
@@ -15,7 +15,7 @@ permalink: /help/clients/
 {% if client.type == type.slug %}
 <div class="col-md-4" style="min-height:280px;">
 {% if client.img %}
- <center><img src="{{ site.url }}/img/clients/{{ client.img }}" height="80px" /></center>
+ <center><img src="{{ site.url }}/assets/img/clients/{{ client.img }}" height="80px" /></center>
 {% endif %}
 <center><h3>{{ client.name }}</h3></center>
 <ul class="list-group">
diff --git a/pages/contact.html b/pages/contact.html
index 2d60bbc..9cd07d8 100644
--- a/pages/contact.html
+++ b/pages/contact.html
@@ -44,10 +44,10 @@ fingerprint = 77F1 D65B 5FF0 54DC 9286 6078 0314 CD85 0330 5F35</code></pre>
 </div>
 </div>
 <h3 id="signed-contact-information">Signed Contact Information</h3>
- <p>A signed copy of this information may be found <a href="https://im.mattrude.com/contact.txt">here</a>, or using my <a href="https://keyserver.mattrude.com/d/0x0314CD8503305F35">ECC key</a>, may be found <a href="https://im.mattrude.com/contact-ecc.txt">here</a>. You may validate these files by running the below commands:</p>
+ <p>A signed copy of this information, using my <a href="https://keyserver.mattrude.com/d/0xc4909ee495b0761f">standard key</a>, may be found <a href="https://im.mattrude.com/contact.txt">here</a>, or using my <a href="https://keyserver.mattrude.com/d/0x0314CD8503305F35">ECC key</a>, may be found <a href="https://im.mattrude.com/contact-ecc.txt">here</a>. You may validate these files by running the below commands:</p>
 <div class="highlighter-rouge">
 <pre class="highlight"><code style="overflow:auto;word-wrap:normal;white-space:pre;">curl -s https://im.mattrude.com/contact.txt |gpg --keyserver-options auto-key-retrieve --auto-key-locate pka --verify
-curl -s https://im.mattrude.com/contact-ecc.txt |gpg --keyserver-options auto-key-retrieve --auto-key-locate pka --verify
+curl -s https://im.mattrude.com/contact-ecc.txt |gpg2 --keyserver-options auto-key-retrieve --auto-key-locate pka --verify
 </code></pre>
 </div>
 </div>
diff --git a/pages/creating-account.html b/pages/creating-account.html
index 06bffa1..470dec5 100644
--- a/pages/creating-account.html
+++ b/pages/creating-account.html
@@ -19,7 +19,7 @@ permalink: /help/creating-a-new-account/
 {% if client.type == type.slug %}
 <div class="col-md-4" style="min-height:280px;">
 {% if client.img %}
- <center><img src="{{ site.url }}/img/clients/{{ client.img }}" height="80px" /></center>
+ <center><img src="{{ site.url }}/assets/img/clients/{{ client.img }}" height="80px" /></center>
 {% endif %}
 <center><h3>{{ client.name }}</h3></center>
 <ul class="list-group">
diff --git a/pages/definitions.md b/pages/definitions.md
index 2c6be8c..b79b9fe 100644
--- a/pages/definitions.md
+++ b/pages/definitions.md
@@ -1,9 +1,11 @@
 ---
-layout: default
+layout: definitions
 title: XMPP Definitions
 permalink: /help/definitions/
 ---
 
+# XMPP Definitions
+
 ## BOSH
 <b>B</b>idirectional-streams <b>O</b>ver <b>S</b>ynchronous <b>H</b>TTP (BOSH) used to transport XMPP [stanzas](#stanza). The result is an HTTP binding for XMPP communications that is useful in situations where a device or client is unable to maintain a long-lived [TCP](#tcp) connection to an XMPP server.
 
@@ -77,3 +79,4 @@ An XMPP server provides basic messaging, [presence](#presence), and XML routing
 
 ## XML
 E<b>X</b>tensible <b>M</b>arkup <b>L</b>anguage (XML) is a markup language that defines a set of rules for encoding documents in a format that is both human-readable and machine-readable. XML is the format that messages are sent/received in when communication with XMPP (See [XML](https://en.wikipedia.org/wiki/XML)).
+</div>
diff --git a/pages/privacy-policy.md b/pages/privacy-policy.md
index a9aa489..e6ca0d8 100644
--- a/pages/privacy-policy.md
+++ b/pages/privacy-policy.md
@@ -6,7 +6,7 @@ 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>
 
-Our general policy regarding your data is to save as much as needed and as little as possible. This document will try to explain what personal data we store and how we handle that.
+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.
 
 ## What is stored
 
diff --git a/pages/register_web/register.html b/pages/register_web/register.html
index cf6a11b..cbe648f 100644
--- a/pages/register_web/register.html
+++ b/pages/register_web/register.html
@@ -56,20 +56,20 @@ permalink: /files/register_web/register.html
 <form action="{{ site.url }}/register/" method="post" class="form-horizontal" role="form" onsubmit="return checkPw(this)">
 <div style="margin-bottom: 25px" class="input-group">
 <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
- <input type="text" class="form-control" name="username" value="" placeholder="Username" id="username" />
+ <input type="text" class="form-control" name="username" value="" placeholder="Username" id="username" required />
 <span class="input-group-addon" style="font-size:0.8em;font-weight:bold;">@{hostname}</span>
 </div>
 <div style="margin-bottom: 25px" class="input-group">
 <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
- <input type="password" class="form-control" name="password" placeholder="Password" id="password" />
+ <input type="password" class="form-control" name="password" placeholder="Password" id="password" required />
 </div>
 <div style="margin-bottom: 25px" class="input-group">
 <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
- <input type="password" class="form-control" name="confirm-password" placeholder="Confirm Password" id="confirm-password" />
+ <input type="password" class="form-control" name="confirm-password" data-validation-match-match="password" data-validation-match-message="Your passwords must mach" placeholder="Confirm Password" id="confirm-password" required />
 </div>
 <div style="margin-bottom: 25px" class="input-group">
 <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
- <input type="text" class="form-control" name="email" placeholder="E-Mail" id="email" />
+ <input type="email" class="form-control" name="email" placeholder="E-Mail" id="email" required />
 </div>
 <div style="margin-bottom:25px;margin:0 auto;" class="input-group test">
 {captcha}
author	Matt Rude <[email protected]>	2018-01-22 13:48:16 -0600
committer	Matt Rude <[email protected]>	2018-01-22 13:48:16 -0600
commit	e755b64be38b1396a423bcd42d58f07bee67713a (patch)
tree	678fb24834e09d76481acc19136c82c14d9a3e6f
parent	fe0ae7764a73598604c1c2207aea94288dc536ab (diff)
download	xmpp-site-builder-e755b64be38b1396a423bcd42d58f07bee67713a.tar.gz xmpp-site-builder-e755b64be38b1396a423bcd42d58f07bee67713a.tar.bz2 xmpp-site-builder-e755b64be38b1396a423bcd42d58f07bee67713a.zip