diff options
author | Matt Rude <[email protected]> | 2017-05-04 14:03:57 -0500 |
---|---|---|
committer | Matt Rude <[email protected]> | 2017-05-04 14:03:57 -0500 |
commit | 9670174db8b5b1e2f83e9f2ebbc15cac49fe0698 (patch) | |
tree | 2800e64380975606e88811a201efb1de340276fb | |
parent | c24b7cf6ae883ef2878dcd2a1211bf0adfe2d1e0 (diff) | |
download | xmpp-site-builder-9670174db8b5b1e2f83e9f2ebbc15cac49fe0698.tar.gz xmpp-site-builder-9670174db8b5b1e2f83e9f2ebbc15cac49fe0698.tar.bz2 xmpp-site-builder-9670174db8b5b1e2f83e9f2ebbc15cac49fe0698.zip |
Updates
-rw-r--r-- | 404.html | 1 | ||||
-rw-r--r-- | Gemfile.lock | 153 | ||||
-rw-r--r-- | _config.yml | 51 | ||||
-rw-r--r-- | certificates.md | 22 | ||||
-rw-r--r-- | help/definitions.md | 2 | ||||
-rw-r--r-- | index.md | 5 |
6 files changed, 142 insertions, 92 deletions
@@ -1,6 +1,7 @@ --- layout: default sitemap: false +permalink: /404.html --- <br /> diff --git a/Gemfile.lock b/Gemfile.lock index d7b5eb7..722d133 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,61 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.1) - actionpack (= 5.0.0.1) - nio4r (~> 1.2) + actioncable (5.1.0) + actionpack (= 5.1.0) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) + actionmailer (5.1.0) + actionpack (= 5.1.0) + actionview (= 5.1.0) + activejob (= 5.1.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.0.1) - actionview (= 5.0.0.1) - activesupport (= 5.0.0.1) + actionpack (5.1.0) + actionview (= 5.1.0) + activesupport (= 5.1.0) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.1) - activesupport (= 5.0.0.1) + actionview (5.1.0) + activesupport (= 5.1.0) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.1) - activesupport (= 5.0.0.1) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.0) + activesupport (= 5.1.0) globalid (>= 0.3.6) - activemodel (5.0.0.1) - activesupport (= 5.0.0.1) - activerecord (5.0.0.1) - activemodel (= 5.0.0.1) - activesupport (= 5.0.0.1) - arel (~> 7.0) - activesupport (5.0.0.1) + activemodel (5.1.0) + activesupport (= 5.1.0) + activerecord (5.1.0) + activemodel (= 5.1.0) + activesupport (= 5.1.0) + arel (~> 8.0) + activesupport (5.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.4.0) - arel (7.1.1) - builder (3.2.2) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) + arel (8.0.0) + builder (3.2.3) colorator (1.1.0) commonjs (0.2.7) - concurrent-ruby (1.0.2) - cssminify (1.0.2) - erubis (2.7.0) + concurrent-ruby (1.0.5) + cssminify2 (2.0.1) + erubi (1.6.0) execjs (2.7.0) - ffi (1.9.14) + ffi (1.9.18) forwardable-extended (2.6.0) - globalid (0.3.7) - activesupport (>= 4.1.0) - htmlcompressor (0.3.0) - i18n (0.7.0) - jekyll (3.2.1) + globalid (0.4.0) + activesupport (>= 4.2.0) + htmlcompressor (0.3.1) + i18n (0.8.1) + jekyll (3.4.3) + addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -66,29 +68,29 @@ GEM jekyll-less (0.0.4) jekyll (>= 0.10.0) less (>= 2.0.5) - jekyll-minifier (0.0.9) - cssminify (~> 1.0) + jekyll-minifier (0.1.1) + cssminify2 (~> 2.0) htmlcompressor (~> 0.3) jekyll (~> 3.0) uglifier (~> 2.7) - jekyll-sass-converter (1.4.0) + jekyll-sass-converter (1.5.0) sass (~> 3.4) - jekyll-sitemap (0.11.0) - addressable (~> 2.4.0) + jekyll-sitemap (1.1.1) + jekyll (~> 3.3) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) - json (2.0.2) - kramdown (1.12.0) + json (2.1.0) + kramdown (1.13.2) less (2.6.0) commonjs (~> 0.2.7) - libv8 (3.16.14.15) + libv8 (3.16.14.19) liquid (3.0.6) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.4) + mail (2.6.5) mime-types (>= 1.16, < 4) mercenary (0.3.6) method_source (0.8.2) @@ -96,66 +98,65 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.9.0) - nio4r (1.2.1) - nokogiri (1.6.8) + minitest (5.10.1) + nio4r (2.0.0) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) pathutil (0.14.0) forwardable-extended (~> 2.6) - pkg-config (1.1.7) + public_suffix (2.0.5) rack (2.0.1) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.1) - actioncable (= 5.0.0.1) - actionmailer (= 5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) - activemodel (= 5.0.0.1) - activerecord (= 5.0.0.1) - activesupport (= 5.0.0.1) + rails (5.1.0) + actioncable (= 5.1.0) + actionmailer (= 5.1.0) + actionpack (= 5.1.0) + actionview (= 5.1.0) + activejob (= 5.1.0) + activemodel (= 5.1.0) + activerecord (= 5.1.0) + activesupport (= 5.1.0) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.1) + railties (= 5.1.0) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.1) + rails-dom-testing (2.0.2) activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.0.1) - actionpack (= 5.0.0.1) - activesupport (= 5.0.0.1) + railties (5.1.0) + actionpack (= 5.1.0) + activesupport (= 5.1.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) ffi (>= 0.5.0) ref (2.0.0) rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.22) - sprockets (3.7.0) + sass (3.4.23) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) - thread_safe (0.3.5) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -173,4 +174,4 @@ DEPENDENCIES therubyracer BUNDLED WITH - 1.13.0 + 1.14.6 diff --git a/_config.yml b/_config.yml index a0e0587..5f6fc94 100644 --- a/_config.yml +++ b/_config.yml @@ -1,22 +1,46 @@ # Site settings -title: therudes.com Communication Service +title: mattrude.com Communication Service email: [email protected] description: "" -url: "https://conference.therudes.com" -name: "conference.therudes.com" -baseurl: "" -destination: "/var/www/therudes.im" +url: "https://im.mattrude.com" +name: "mattrude.com" +baseurl: "im.mattrude.com" +destination: "/root/xmpp-site/www/im.mattrude.com" owner_name: "Matt Rude" owner_pgpkey: "0xc4909ee495b0761f" -xmpp-url: "therudes.com" -xmpp-conference-url: "conference.therudes.com" -fingerprint-sha1: "BD:32:61:05:5D:F2:1D:FC:9E:40:74:29:CC:37:98:60:B5:C6:7C:8B" -fingerprint-sha256: "C3:0E:A2:BF:1E:C5:C4:DD:E9:BE:10:1D:A1:F6:79:34:7C:FD:4A:CF:7F:73:22:16:CA:DC:F5:4C:59:A7:F8:1D" -fingerprint-conference-sha1: "35:3E:7B:63:89:B3:C6:6D:D7:32:70:C6:8B:27:92:A6:74:1C:98:96" -fingerprint-conference-sha256: "8F:54:F8:8B:C1:52:C3:40:E6:47:94:9D:DA:1E:1E:51:E5:92:FC:9F:79:A8:E3:2D:2E:84:1D:FC:F2:8B:7A:AD" -prosody-version: "0.10.0" +xmpp-url: "mattrude.com" +xmpp-host: "im.mattrude.com" +xmpp-conference-url: "conference.mattrude.com" +xmpp-proxy-url: "proxy.mattrude.com" # XEP-0065: SOCKS5 Bytestreams (Proxy) + +xep-0163: 1 # Personal Eventing Protocal +xep-0237: 1 # Roster Versioning +xep-0280: 1 # Message Carbons +xep-0191: 1 # Blocking Command +xep-0045: 0 # Multi-User Chat +xep-0198: 1 # Stream Management +xep-0313: 1 # Message Archive Management +xep-0352: 1 # Client State Indication +xep-0363: 1 # HTTP File Upload +xep-0065: 0 # SOCKS 5 Bytestreams (Proxy) +xep-0357: 1 # Push Notifications +xep-0375: 0 # XMPP protocol compliance levels for 2016 + +fingerprints: 1 +fingerprint-proxy: 1 +fingerprint-conference: 0 +fingerprint-expires: "May 30 16:34:00 2017 GMT" +fingerprint-conference-expires: "May 30 16:34:00 2017 GMT" +fingerprint-proxy-expires: "May 30 16:34:00 2017 GMT" +fingerprint-sha1: "F1:25:FD:E3:FA:A8:83:92:76:D6:C4:52:7F:01:52:BB:FB:82:C0:9A" +fingerprint-sha256: "FC:07:0F:0E:2D:ED:32:B3:6F:56:75:BF:15:E6:AF:E2:37:89:AC:1D:0B:42:AD:75:D3:1D:1D:C4:14:F7:EA:E6" +fingerprint-conference-sha1: "F1:25:FD:E3:FA:A8:83:92:76:D6:C4:52:7F:01:52:BB:FB:82:C0:9A" +fingerprint-conference-sha256: "FC:07:0F:0E:2D:ED:32:B3:6F:56:75:BF:15:E6:AF:E2:37:89:AC:1D:0B:42:AD:75:D3:1D:1D:C4:14:F7:EA:E6" +fingerprint-proxy-sha1: "F1:25:FD:E3:FA:A8:83:92:76:D6:C4:52:7F:01:52:BB:FB:82:C0:9A" +fingerprint-proxy-sha256: "FC:07:0F:0E:2D:ED:32:B3:6F:56:75:BF:15:E6:AF:E2:37:89:AC:1D:0B:42:AD:75:D3:1D:1D:C4:14:F7:EA:E6" +prosody-version: "0.10" # Analytics settings #google_analytics_id: UA-9532791-9 @@ -37,8 +61,7 @@ exclude: gems: - jekyll-sitemap -- jekyll-minifier -#- jekyll-less +- jekyll-less #- jekyll-press #- jekyll-redirect-from #- jekyll-last-modified-at diff --git a/certificates.md b/certificates.md index d6cc428..e81eb10 100644 --- a/certificates.md +++ b/certificates.md @@ -26,6 +26,7 @@ One of the benefits of communicating via XMPP is the level of security involved. <pre>{{ site.fingerprint-sha256 }}</pre> </div> {% endif %} +{% if site.xmpp-conference-url and site.xep-0045 == 1 %} <h2>{{ site.xmpp-conference-url }}</h2> <p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-conference-expires }})</small></p> {% if site.xmpp-conference-url and site.xep-0045 == 1 and site.fingerprint-conference-sha1 %} @@ -44,6 +45,7 @@ One of the benefits of communicating via XMPP is the level of security involved. <pre>{{ site.fingerprint-conference-sha256 }}</pre> </div> {% endif %} +{% endif %} {% if site.xmpp-proxy-url and site.xep-0065 == 1 %} <h2>{{ site.xmpp-proxy-url }}</h2> <p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-proxy-expires }})</small></p> @@ -64,6 +66,26 @@ One of the benefits of communicating via XMPP is the level of security involved. </div> {% endif %} {% endif %} +{% if site.xmpp-upload-url and site.xep-0363 == 1 %} +<h2>{{ site.xmpp-upload-url }}</h2> +<p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-upload-expires }})</small></p> +{% if site.xmpp-upload-url and site.xep-0363 == 1 and site.fingerprint-upload-sha1 %} + <div class="cert-title"> + <b>SHA1 Fingerprint</b> + </div> + <div class="cert-content"> + <pre>{{ site.fingerprint-upload-sha1 }}</pre> + </div> +{% endif %} +{% if site.xmpp-upload-url and site.xep-0363 == 1 and site.fingerprint-upload-sha256 %} + <div class="cert-title"> + <b>SHA256 Fingerprint</b> + </div> + <div class="cert-content"> + <pre>{{ site.fingerprint-upload-sha256 }}</pre> + </div> +{% endif %} +{% endif %} </div> <!-- Closing cert-table id div --> <p style='text-align:right;'><a href="https://xmpp.net/result.php?domain={{ site.xmpp-url }}&type=server"><img src="https://xmpp.net/badge.php?domain={{ site.xmpp-url }}" alt="xmpp.net score" /></a></p> diff --git a/help/definitions.md b/help/definitions.md index e96f6ee..01eb1f7 100644 --- a/help/definitions.md +++ b/help/definitions.md @@ -9,6 +9,8 @@ permalink: /help/definitions/ ## Dialback +<b>Dialback</b> is used between two (2) XMPP servers to provide identity verification. Server Dialback uses the Domain Name System ([DNS](#DNS)) as the basis for verifying identity; the basic approach is that when a receiving server accepts a server-to-server connection from an initiating server, it does not process XMPP [stanzas](#stanza) over the connection until it has verified the initiating server's identity. + ## Domain ## DNS @@ -15,7 +15,8 @@ This service requires the use of a client to connect to the server with. Please * Hostname: <b>{{ site.xmpp-url }}</b> * Port: <b>5222</b>{% if site.xmpp-conference-url and site.xep-0045 == 1 %} * Conference Rooms: <b>{{ site.xmpp-conference-url }}</b>{% endif %}{% if site.xmpp-proxy-url and site.xep-0065 == 1 %} -* Socks 5 Proxy: <b>{{ site.xmpp-proxy-url }}</b>{% endif %} +* Socks 5 Proxy: <b>{{ site.xmpp-proxy-url }}</b>{% endif %}{% if site.xmpp-upload-url and site.xep-0363 == 1 %} +* HTTP Upload: <b>{{ site.xmpp-upload-url }}</b>{% endif %} ## Services Provided @@ -80,7 +81,7 @@ Web Presence provides the status of a user via a image URL. Please see the page * SSL/TLS encryption is [required](https://github.com/stpeter/manifesto/blob/master/manifesto.txt) between clients and servers (C2S) and server to server (S2S) connections * The backend is configured to store hashed and salted authentication data -* Use Off-the-Record (OTR) in your chat client to have fully encrypted chats +* Use Off-the-Record ([OTR]({{ site.url }}/help/definitions/#otr)) in your chat client to have fully encrypted chats ## Policies |