aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Rude <[email protected]>2016-07-07 13:57:19 -0500
committerMatt Rude <[email protected]>2016-07-07 13:57:19 -0500
commit292e8250739a3e098cae207f686044ee777c0bfc (patch)
treebbf8905e4bf7b436d3eba2d01458030c8268bcfc
parent099df45c80e185c7b336a0560142a64586ff6f70 (diff)
downloadxmpp-site-292e8250739a3e098cae207f686044ee777c0bfc.tar.gz
xmpp-site-292e8250739a3e098cae207f686044ee777c0bfc.tar.bz2
xmpp-site-292e8250739a3e098cae207f686044ee777c0bfc.zip
Added help/generic-configuration.md
-rw-r--r--_config.yml2
-rw-r--r--_includes/menu.html3
-rw-r--r--_posts/2016-07-03-Added-new-certs.md2
-rw-r--r--about.md2
-rw-r--r--doc/guides.md7
-rw-r--r--help/definitions.md (renamed from doc/definitions.md)2
-rw-r--r--help/generic-configuration.md24
-rw-r--r--help/help.md2
-rw-r--r--index.md8
9 files changed, 37 insertions, 15 deletions
diff --git a/_config.yml b/_config.yml
index 106afe2..ec0f5a5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,6 +10,8 @@ destination: "/var/www/therudes.im"
owner_name: "Matt Rude"
owner_pgpkey: "0xc4909ee495b0761f"
+xmpp-url: "therudes.com"
+xmpp-conference-url: "conference.therudes.com"
prosody-version: "0.9.10"
# Analytics settings
diff --git a/_includes/menu.html b/_includes/menu.html
index e80c052..bd7783b 100644
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -7,12 +7,13 @@
</div>{% if page.url contains 'doc' %}
<div id="menu-sub">
<a href="{{ site.url }}/doc/"><strong>Docs:</strong></a> |
- <a href="{{ site.url }}/doc/definitions/">Definitions</a> |
<a href="{{ site.url }}/doc/supported-standards/">Supported Standards</a>
</div>{% endif %}{% if page.url contains 'help' %}
<div id="menu-sub">
<a href="{{ site.url }}/help/"><strong>Help:</strong></a> |
<a href="{{ site.url }}/help/client-list/">Clients list</a> |
+ <a href="{{ site.url }}/help/definitions/">Definitions</a> |
+ <a href="{{ site.url }}/help/generic-configuration/">Generic Configuration</a> |
<a href="{{ site.url }}/help/using-conferences/">Conferences</a> |
<a href="{{ site.url }}/help/web-presence/">Web Presence</a>
</div>{% endif %}
diff --git a/_posts/2016-07-03-Added-new-certs.md b/_posts/2016-07-03-Added-new-certs.md
index a29afab..bf8fe2b 100644
--- a/_posts/2016-07-03-Added-new-certs.md
+++ b/_posts/2016-07-03-Added-new-certs.md
@@ -9,7 +9,7 @@ tags: SSL Certs
Today I added new SSL certificates to the service.
-* These certificates will expire on **06-June-2016**.
+* These certificates will expire on **06-June-2017**.
These services fingerprints are as following.
diff --git a/about.md b/about.md
index 63380a8..2358418 100644
--- a/about.md
+++ b/about.md
@@ -6,7 +6,7 @@ permalink: /about/
## About: <small>This Service</small>
-An XMPP server provides basic messaging, [presence]({{ site.url }}/doc/definitions/#presence), and XML routing features. This page lists Jabber/XMPP server software that you can use to run your own XMPP service, either over the Internet or on a local area network.
+An XMPP server provides basic messaging, [presence]({{ site.url }}/help/definitions/#presence), and XML routing features. This page lists Jabber/XMPP server software that you can use to run your own XMPP service, either over the Internet or on a local area network.
## About: <small>This Server</small>
diff --git a/doc/guides.md b/doc/guides.md
index 703fff6..f8afa02 100644
--- a/doc/guides.md
+++ b/doc/guides.md
@@ -4,13 +4,6 @@ title: Documentation
permalink: /doc/
---
-## Client Documents
-
-* [Definitions]({{ site.url }}/doc/definitions/)
-
## Administrator Documents
* [Supported XMPP Standards]({{ site.url }}/doc/supported-standards/)
-
-## Install Gudes
-* [Install Prosody on Ubuntu]({{ site.url }}/doc/prosody-install-ubuntu/)
diff --git a/doc/definitions.md b/help/definitions.md
index 5e78e98..3d0c80b 100644
--- a/doc/definitions.md
+++ b/help/definitions.md
@@ -1,7 +1,7 @@
---
layout: default
title: XMPP Definitions
-permalink: /doc/definitions/
+permalink: /help/definitions/
---
## BOSH
diff --git a/help/generic-configuration.md b/help/generic-configuration.md
new file mode 100644
index 0000000..acf50f5
--- /dev/null
+++ b/help/generic-configuration.md
@@ -0,0 +1,24 @@
+---
+layout: default
+title: Generic Configuration
+permalink: /help/generic-configuration/
+---
+
+This article provides the general configuration instructions for the {{ site.xmpp-url }} instant messaging service.
+
+Every Jabber client has a different method of configuration. Our recommended and supported IM client is Spark, which you can download. To configure a client on your own (perhaps to take advantage of a client that also supports AIM, such as GAIM or Adium), here is the generic information you'll need:
+
+* Protocol: Jabber/XMPP. You must use a client which supports this standard. A fairly exhaustive list of such clients can be found on the Jabber.org home page.
+* Servername: `{{ site.xmpp-url }}`
+* Port: 5222
+* SSL: On. If if offers "STARTTLS" support, choose that; otherwise, just make sure it's trying to connect securely.
+
+Some clients hide the "SSL" option. Some automatically change the port to 5223 when you turn on SSL; others don't. Both of these are things to watch out for. (Some clients also handle SSL negatively -- there'll be a box for "allow plain-text transmission" or the like that must be unchecked.)
+
+On first login, you will of course be asked for a login name. This will probably take the form of `username@{{ site.xmpp-url }}`, using your own username, of course.
+
+Some clients may require you to specify a full IM address when you're adding someone to your Contact list. This will take the form of `username@{{ site.xmpp-url }}`. Most clients will also let you give a nickname to your contacts when you add them, so you don't have to see the whole address all the time.
+
+If you want to access a chat room, you may need to specify the chat room server. It's `{{ site.xmpp-conference-url }}`. The generic address of a chat room is `chatroom-name@{{ site.xmpp-conference-url }}`. Note that the "real" name of a chat room cannot have spaces, but you can specify a nickname or description which some clients will display in lieu of the real name -- this can cause some confusion.
+
+Please see the page [Using Conferences]({{ site.url }}/help/using-conferences/) for more infromation on how to connect and use the confrencing service.
diff --git a/help/help.md b/help/help.md
index d3f56f1..ff4c355 100644
--- a/help/help.md
+++ b/help/help.md
@@ -7,5 +7,7 @@ permalink: /help/
## Client Documents
* [Client List]({{ site.url }}/help/client-list/)
+* [Definitions]({{ site.url }}/help/definitions/)
+* [Generic Configuration]({{ site.url }}/help/generic-configuration/)
* [Using Conferences]({{ site.url }}/help/using-conferences/)
* [Using Web Presence]({{ site.url }}/help/web-presence/)
diff --git a/index.md b/index.md
index c072cac..24d33c7 100644
--- a/index.md
+++ b/index.md
@@ -4,19 +4,19 @@ 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 }}/doc/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 **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.
## 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 }}/doc/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.
+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.
## Services Provided
### 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 }}/doc/definitions/#federation) XMPP servers, but only members of this server may create new 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.
-The confrence services URL is `conference.therudes.com`, the fingerprints are listed below.
+The confrence services URL is `{{ site.xmpp-conference-url }}`, the fingerprints are listed below.
Please see the page [Using Conferences]({{ site.url }}/help/using-conferences/) for more infromation on how to connect and use the confrencing service.