diff options
| author | Matt Rude <[email protected]> | 2017-07-27 15:53:56 -0500 |
|---|---|---|
| committer | Matt Rude <[email protected]> | 2017-07-27 15:53:56 -0500 |
| commit | 2891142a3d623d67adb6eeda4892b524b392d040 (patch) | |
| tree | 6301ace8180959aa5d21c81fb3b1bbbc35f29a58 | |
| parent | 85153da574969b0614c0f4eb8f187bec6bbdb1c4 (diff) | |
| download | xmpp-site-builder-2891142a3d623d67adb6eeda4892b524b392d040.tar.gz xmpp-site-builder-2891142a3d623d67adb6eeda4892b524b392d040.tar.bz2 xmpp-site-builder-2891142a3d623d67adb6eeda4892b524b392d040.zip | |
Updates
| -rw-r--r-- | about.md | 2 | ||||
| -rw-r--r-- | css/main.css | 9 | ||||
| -rw-r--r-- | help/definitions.md | 2 | ||||
| -rw-r--r-- | help/using-conferences.md | 42 | ||||
| -rw-r--r-- | index.html | 4 |
5 files changed, 53 insertions, 6 deletions
@@ -8,7 +8,7 @@ permalink: /about/ ## This Service -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. +This server provides instant messaging service, via the XMPP protocol, to users with an account on this domain. An XMPP server provides basic messaging, [presence]({{ site.url }}/help/definitions/#presence), and XML routing features. 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). diff --git a/css/main.css b/css/main.css index 180e0dd..b47086d 100644 --- a/css/main.css +++ b/css/main.css @@ -11,3 +11,12 @@ td.FAILED { color: white; } +.h1, .h2, .h3, h1, h2, h3 { +/* padding-top: 60px; */ +} + +@media (max-width: 968px) { + .pull-right, .pull-left { + text-align: center; + } + } diff --git a/help/definitions.md b/help/definitions.md index cab17b6..2c6be8c 100644 --- a/help/definitions.md +++ b/help/definitions.md @@ -51,6 +51,8 @@ A users unique [XMPP](#xmpp-server) address, is called a JID (or for historical ## LAN +## OTR + ## Presence A users [XMPP](#xmpp-server) presence indicates if a users is **online**, **away**, or **offline**. diff --git a/help/using-conferences.md b/help/using-conferences.md index b41c409..0a7bd68 100644 --- a/help/using-conferences.md +++ b/help/using-conferences.md @@ -4,15 +4,51 @@ title: Using Conferences permalink: /help/using-conferences/ --- -{% if site.xmpp-conference-url and site.xep-0045 == 1 %} # Conferences +{% if site.xmpp-conference-url and site.xep-0045 == 1 %} + XMPP is normally a single person to single person chat system, but it has the ability to also run conference rooms. A conference room or MUC (Multiple User Chat) allows users on the same server, or via [federation]({{ site.url }}/help/definitions/#federation), different servers or domains, to all connect to the same chat room. Similar to how IRC works. -## Connecting from a federated XMPP server +## Managing a Conference + +### Conference room options + +* <b>Name:</b> The name of the conference room. +* <b>Description:</b> The conference room descriptions +* <b>Persistent:</b> Prevent the room from being deleted after the last user leaves. +* <b>Searchable:</b> Allows users to search for the room in the list of rooms on the server and connect. +* <b>Change Subject:</b> Allow none <u>admins</u> to change the rooms subject. +* <b>Password:</b> Set the password for the room; all users who wish to access the room, must use the password to enter. +* <b>Moderated:</b> Moderated rooms require a admin to approve each message before it is delevered to the rest of the room. +* <b>Members-Only:</b> Only allow members of the room to enter the room. +* <b>History:</b> Maximum number of past messages to return by the server when a user connects. +* <b>Logging:</b> Enable external logging for the room; when enabled, any user on the internet may view this log. + +## Joining a Conference + +### Connecting from local XMPP server + + + +### 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. +## Conference Plugins + +### Pastebin + +When someone posts to a room a "large" (greater then 500 characters or 5 lines) message, the server will intercept the message and convert it to a URL pointing to a built-in pastebin server. Generated URLs will point will have address contaning `https://{{ site.xmpp-conference-url }}/pastebin/`. + +<div class="alert alert-warning" role="alert"><b>Note:</b> If a message is sent via <a href="https://conversations.im/omemo/">OMEMO</a>, the pastebin function will not create a link since the server is unable to read the message.</div> + +### HTTP File Upload + +### Security Labels + +A security label, sometimes referred to as a confidentiality label, is a structured representation of the sensitivity of a piece of information. A security label is used in conjunction with a clearance, a structured representation of what information sensitivities a person (or other entity) is authorized to access, and a security policy to control access to each piece of information. Security Lables are described in <a href="https://xmpp.org/extensions/xep-0258.html">XEP-0258</a>. + {% if site.fingerprints == 1 %} ## Certificate Fingerprints @@ -54,5 +90,5 @@ One of the benefits of communicating via XMPP is the level of security involved. </div> <!-- Closing cert-table id div --> {% endif %} {% else %} -This server dose not support conferences, sorry. +This server dose not support conferences at this time, sorry. {% endif %} @@ -36,8 +36,8 @@ permalink: / <div class="col-md-5"> <h1>Connecting</h1> <ul> - <li>XMPP Port: <b>5222</b></li> - <li>Hostname: <b>{{ site.xmpp-url }}</b></li> + <li>Port: <b>5222</b></li> + <li>Domain: <b>{{ site.xmpp-url }}</b></li> <li>Server Name: <b>{{ site.xmpp-host }}</b></li>{% if site.xmpp-conference-url and site.xep-0045 == 1 %} <li>Conference Rooms: <b>{{ site.xmpp-conference-url }}</b></li>{% endif %}{% if site.xmpp-proxy-url and site.xep-0065 == 1 %} <li>Socks 5 Proxy: <b>{{ site.xmpp-proxy-url }}</b></li>{% endif %}{% if site.xmpp-upload-url and site.xep-0363 == 1 %} |