aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Rude <[email protected]>2016-07-25 22:58:15 -0500
committerMatt Rude <[email protected]>2016-07-25 22:58:15 -0500
commit640a3e7fa7a5f32adb292e8c28cc819763097632 (patch)
treeb366017034414db7bc1e4b80cb32809152c8a134
parentcdb4f612c0f51f84a5ac1921499a5948ba69c027 (diff)
downloadxmpp-site-640a3e7fa7a5f32adb292e8c28cc819763097632.tar.gz
xmpp-site-640a3e7fa7a5f32adb292e8c28cc819763097632.tar.bz2
xmpp-site-640a3e7fa7a5f32adb292e8c28cc819763097632.zip
Updates
-rw-r--r--_includes/footer.html4
-rw-r--r--_layouts/default.html2
-rw-r--r--_posts/2016-07-03-Added-new-certs.md32
-rw-r--r--about.md3
-rw-r--r--changelog.html17
-rw-r--r--css/site.less3
-rw-r--r--help/using-conferences.md4
-rw-r--r--index.md101
-rw-r--r--news.html20
9 files changed, 69 insertions, 117 deletions
diff --git a/_includes/footer.html b/_includes/footer.html
index 4210dd1..71ae9df 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,9 +1,9 @@
<div id="footer"><!-- Starting Footer Section -->
<div class="footer-left">
- <p><a href="{{ site.url }}">Home</a> | <a href="{{ '/source/' | prepend: site.url }}">Source</a> | <a href="{{ '/contact/' | prepend: site.url }}">Contact</a><span class="small-hide"> | <a href="{{ '/changelog/' | prepend: site.url }}">Changelog</a></span></p>
+ <p><a href="{{ site.url }}">Home</a> | <a href="{{ '/source/' | prepend: site.url }}">Source</a> | <a href="{{ '/contact/' | prepend: site.url }}">Contact</a></p>
</div>
<div class="footer-right">
- <p>Copyright &copy; {{ site.time | date: "%Y" }} by <a href="https://mattrude.com">{{ site.owner_name }}</a></p>
+ <p>&copy; {{ site.time | date: "%Y" }} by <a href="https://mattrude.com">{{ site.owner_name }}</a></p>
</div>
</div><!-- Closing Footer Section -->
</div><!-- Closing Menu Section (from header) -->
diff --git a/_layouts/default.html b/_layouts/default.html
index f48e1bc..0cc18b8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,7 +2,7 @@
{% include header.html %}
<div id="header">
<h1>{{ site.title }}<small> - {{ page.title }}</small></h1>
- <h4><small>node: </small>{{ site.name }}</h4>
+ <h4><small>node: </small>{{ site.baseurl }}</h4>
</div>
{% include menu.html %}
{{ content }}
diff --git a/_posts/2016-07-03-Added-new-certs.md b/_posts/2016-07-03-Added-new-certs.md
deleted file mode 100644
index bf8fe2b..0000000
--- a/_posts/2016-07-03-Added-new-certs.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-layout: news
-title: Added new SSL Cert for therudes.com & conference.therudes.com
-date: 2016-07-03 16:00
-author: Matt Rude
-category: changelog
-tags: SSL Certs
----
-
-Today I added new SSL certificates to the service.
-
-* These certificates will expire on **06-June-2017**.
-
-These services fingerprints are as following.
-
-### therudes.com <small> - SHA1 Fingerprint</small>
-
- BD:32:61:05:5D:F2:1D:FC:9E:40:74:29:CC:37:98:60:B5:C6:7C:8B
-
-### therudes.com <small> - SHA256 Fingerprint</small>
-
- 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
-
-### conference.therudes.com <small> - SHA1 Fingerprint</small>
-
- 35:3E:7B:63:89:B3:C6:6D:D7:32:70:C6:8B:27:92:A6:74:1C:98:96
-
-### conference.therudes.com <small> - SHA256 Fingerprint</small>
-
- 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
-
-
diff --git a/about.md b/about.md
index 2358418..373f69b 100644
--- a/about.md
+++ b/about.md
@@ -10,5 +10,4 @@ An XMPP server provides basic messaging, [presence]({{ site.url }}/help/definiti
## About: <small>This Server</small>
-This server is running [Prosody](https://prosody.im) version {{ site.prosody-version }} on [Ubuntu](http://www.ubuntu.com/) version 16.04 LTS.
-
+This server is running [Prosody](https://prosody.im) version {{ site.prosody-version }} on [Ubuntu](http://www.ubuntu.com/) version 16.04 LTS. The phisical server is located in Minneapolis, Minnesota, USA.
diff --git a/changelog.html b/changelog.html
deleted file mode 100644
index 650442e..0000000
--- a/changelog.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default
-title: Changelog
----
-
-<div id="news">
-<h3>Server Change Log</h3>
-<p>Below you will find the changelog for the XMPP server: {{ site.name }}.</p>
-<ul>
- {% for post in site.categories['changelog'] %}
- <li>
- <h3><a href="{{ post.url }}">{{ post.date | date: '%Y-%b-%d' }} - {{ post.title }}</a></h3>
- {{ post.excerpt }}
- </li>
- {% endfor %}
-</ul>
-</div>
diff --git a/css/site.less b/css/site.less
index d1265e5..d249ae2 100644
--- a/css/site.less
+++ b/css/site.less
@@ -34,7 +34,7 @@ body {
padding: 2px;
padding-top: 10px;
border-bottom: 1px solid #CCC;
- line-height: 1;
+ line-height: 1.1em;
}
i {
color: #A9A9A9;
@@ -165,6 +165,7 @@ fieldset {
}
h1 {
+ line-height: 1em;
a {
text-decoration: none;
}
diff --git a/help/using-conferences.md b/help/using-conferences.md
index d9a1d25..3bc12ea 100644
--- a/help/using-conferences.md
+++ b/help/using-conferences.md
@@ -4,6 +4,7 @@ title: Using Conferences
permalink: /help/using-conferences/
---
+{% if site.xmpp-conference-url %}
## Connecting from a federated XMPP server
By default the server will try to use [TLS]({{ site.url }}/help/definitions/#tls) if the other side supports it, and fall back to [dialback]({{ site.url }}/help/definitions/#dialback) if it does not or if the certificate is incorrect or not trusted.
@@ -31,3 +32,6 @@ One of the benefits of communicating via XMPP is the level of security involved.
</tr>
</table>
+{% else %}
+This server dose not support conferences, sorry.
+{% endif %}
diff --git a/index.md b/index.md
index f4df1d5..73f253b 100644
--- a/index.md
+++ b/index.md
@@ -4,14 +4,20 @@ title: Home
permalink: /
---
-This is the **Rude Family's** communication services website. This site is here to provide basic infromation on using this service. A [XMPP]({{ site.url }}/help/definitions/#xmpp-server) service provides messaging ability via a local client. By using this service, security in increased due to the settings and the fact this service is owned and ran by the users.
+This is the **{{ site.name }}** communication services website. This site is here to provide basic infromation on using this service. A [XMPP]({{ site.url }}/help/definitions/#xmpp-server) service provides messaging ability via a local client. By using this service, security in increased due to the settings and the fact this service is owned and ran by the users.
## How to use the service
This service requires the use of a client to connect to the server with. Please see the [client list]({{ site.url }}/help/client-list/) for a small list of available clients that may be used. My personal preferred clients is [Swift](http://swift.im/) for desktop/laptops and [ChatSecure](https://guardianproject.info/apps/chatsecure/) for mobile.
+## Connecting
+
+* Hostname: <b>{{ site.xmpp-url }}</b>
+* Port: <b>5222</b>
+
## Services Provided
+{% if site.xmpp-conference-url %}
### Confrence Rooms
This service provides confrence rooms via the mulit-user chats (MUC) interface documented in [XEP-0045](http://xmpp.org/extensions/xep-0045.html). The confrence room service allows multiple users to join the same chat room or session at once and enabling all users in that room to comunicate freely. Users may connect to these chat rooms via other [federated]({{ site.url }}/help/definitions/#federation) XMPP servers, but only members of this server may create new rooms.
@@ -19,52 +25,63 @@ This service provides confrence rooms via the mulit-user chats (MUC) interface d
The confrence services URL is `{{ site.xmpp-conference-url }}`, the fingerprints are [listed below]({{ site.url }}/#certificates-fingerprints).
Please see the page [Using Conferences]({{ site.url }}/help/using-conferences/) for more infromation on how to connect and use the confrencing service.
-
-### BOSH Service
-
-[XEP-0124](http://xmpp.org/extensions/xep-0124.html)
+{% endif %}
### Web Presence
Web Presence provides the status of a user via a image URL. Please see the page [Web Presence]({{ site.url }}/help/web-presence/) for more infromation on how to use the web presence service.
-## Certificates Fingerprints
+## Security
+
+* 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
+
+{% if site.fingerprints %}
+### Certificates Fingerprints
One of the benefits of communicating via XMPP is the level of security involved. To allow users to validate the servers they are connecting to, below is the current fingerprints for each domain name.
-<table style="width:100%;">
- <thead>
- <tr>
- <th>{{ site.xmpp-url }}<small> - SHA1 Fingerprint</small></th>
- </tr>
- </thead>
- <tr>
- <td><code>{{ site.fingerprint-sha1 }}</code></td>
- </tr>
- <thead>
- <tr>
- <th>{{ site.xmpp-url }}<small> - SHA256 Fingerprint</small></th>
- </tr>
- </thead>
- <tr>
- <td><code>{{ site.fingerprint-sha256 }}</code></td>
- </tr>
- <thead>
- <tr>
- <th>{{ site.xmpp-conference-url }}<small> - SHA1 Fingerprint</small></th>
- </tr>
- </thead>
- <tr>
- <td><code>{{ site.fingerprint-conference-sha1 }}</code></td>
- </tr>
- <thead>
- <tr>
- <th>{{ site.xmpp-conference-url }}<small> - SHA256 Fingerprint</small></th>
- </tr>
- </thead>
- <tr>
- <td><code>{{ site.fingerprint-conference-sha256 }}</code></td>
- </tr>
-</table>
-
-<a href="https://xmpp.net/result.php?domain={{ site.xmpp-url }}&amp;type=client"><img src="https://xmpp.net/badge.php?domain={{ site.xmpp-url }}" alt="xmpp.net score" /></a>
+<div id="cert-table">
+{% if site.fingerprint-sha1 %}
+ <div class="cert-title">
+ <b>{{ site.baseurl }}<small> - SHA1 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-sha256 %}
+ <div class="cert-title">
+ <b>{{ site.baseurl }}<small> - SHA256 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-sha256 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-conference-sha1 %}
+ <div class="cert-title">
+ <b>{{ site.xmpp-conference-url }}<small> - SHA1 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-conference-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-conference-sha256 %}
+ <div class="cert-title">
+ <b>{{ site.xmpp-conference-url }}<small> - SHA256 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-conference-sha256 }}</pre>
+ </div>
+{% endif %}
+</div> <!-- Closing cert-table id div -->
+{% endif %}
+
+<p style='text-align:right;'><a href="https://xmpp.net/result.php?domain={{ site.xmpp-url }}&amp;type=server"><img src="https://xmpp.net/badge.php?domain={{ site.xmpp-url }}" alt="xmpp.net score" /></a></p>
+
+## Policies
+
+No more information is collected and stored than what is absolutely necessary. This includes rosters, vCards, offline messages, etc.
+
+Spam and abuse including advertisements of any kind will not be tolerated on this network. For spam or abuse please contact us with the full details.
diff --git a/news.html b/news.html
deleted file mode 100644
index ef98128..0000000
--- a/news.html
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: default
-title: News
----
-
-<h3>Service News Page</h3>
-
-<p>Below you will find news and the changelog for therudes.com XMPP service and site.</p>
-
-<div id="news">
-<ul>
- {% for post in site.posts %}
- <li>
- <h2><a href="{{ post.url }}">{{ post.title }}</a></h2>
- <span style="color:#777;font-size:0.9em;">{{ post.date | date: "%B %-d, %Y" }} | Post Category: {{ post.category }} | {{ post.author }}</span>
- {{ post.excerpt }}
- </li>
- {% endfor %}
-</ul>
-</div>