Merge pull request #121 from fsinfuhh/feat/removeJabberMattermost

remove Jabber & Mattermost

.env.dev

@@ -1,5 +1,4 @@
 MAFIASI_DEBUG=True
-MAFIASI_ENABLE_JABBER_INTEGRATION=False
 MAFIASI_ENABLE_LDAP_AUTH_BACKEND=False
 MAFIASI_ENABLE_LDAP_REGISTRATION=False
 MAFIASI_ENABLE_EP_INTEGRATION=False

.env.test

@@ -1,6 +1,5 @@
 MAFIASI_DEBUG=True
 MAFIASI_TESTING=True
-MAFIASI_ENABLE_JABBER_INTEGRATION=False
 MAFIASI_ENABLE_LDAP_AUTH_BACKEND=False
 MAFIASI_ENABLE_LDAP_REGISTRATION=False
 MAFIASI_ENABLE_MUMBLE_INTEGRATION=False

Dockerfile

@@ -26,8 +26,7 @@ ADD . /app/src
 # Put configs in appropriate locations
 RUN cp docker/nginx.conf /etc/nginx/sites-enabled/default && \
     cp docker/uwsgi.ini /etc/uwsgi/mafiasi-dashboard.ini && \
-    cp docker/supervisor.conf /etc/supervisor/conf.d/app.conf && \
-    touch /app/config/jabber_cert_fingerprint
+    cp docker/supervisor.conf /etc/supervisor/conf.d/app.conf
 
 RUN mkdir -p /app/static/mathjax
 RUN cp -rT /usr/share/javascript/mathjax /app/static/mathjax

README.md

@@ -25,15 +25,6 @@ pipenv run ./manage.py migrate
 make
 ```
 
-If you want to use jabber (ejabberd), you have to load the SQL schema
-into the database (you'll find it in the ejabberd source code),
-migrate the jabber database and do some changes to the tables
-```
-psql jabber < ejabberd-source-code/sql/pg.sql
-./manage.py migrate --database jabber
-psql jabber < mafiasi/jabber/sql/*.sql
-```
-
 We try to keep these installation instructions up to date, but we can't
 guarantee.
 

locale/de_DE/LC_MESSAGES/django.po

@@ -1408,97 +1408,6 @@ msgstr "Einladungsmails"
 msgid "Invitation mail was resent."
 msgstr "Einladungsmail wurde erneut versandt."
 
-#: mafiasi/jabber/apps.py:9 mafiasi/jabber/templates/jabber/index.html:5
-msgid "Jabber"
-msgstr "Jabber"
-
-#: mafiasi/jabber/apps.py:10
-msgid ""
-"On our Jabber server you can chat with your fellow students, which are "
-"already on your contact list."
-msgstr ""
-"Auf unserem Jabber-Server hast du deine Kommilitonen automatisch in der "
-"Kontaktliste und kannst mit ihnen chatten."
-
-#: mafiasi/jabber/templates/jabber/index.html:10
-#, python-format
-msgid ""
-"Your Jabber ID is <strong>%(username)s</strong>@%(jabber_domain)s. Note: "
-"it's different from your username."
-msgstr ""
-"Deine Jabber-ID lautet abweichend: <strong>%(username)s</"
-"strong>@%(jabber_domain)s."
-
-#: mafiasi/jabber/templates/jabber/index.html:12
-#, python-format
-msgid "Your Jabber ID is <strong>%(username)s@%(jabber_domain)s</strong>."
-msgstr ""
-"Deine Jabber-ID lautet: <strong>%(username)s@%(jabber_domain)s</strong>."
-
-#: mafiasi/jabber/templates/jabber/index.html:17
-#, python-format
-msgid ""
-"<p>If you want to change your Jabber password, just change it in your <a "
-"href=\"%(account_url)s\">account settings</a>.</p>"
-msgstr ""
-"<p>Wenn du dein Jabber-Passwort ändern möchtest, ändere einfach dein "
-"Passwort in den <a href=\"%(account_url)s\">Account-Einstellungen</a>.</p>"
-
-#: mafiasi/jabber/templates/jabber/index.html:19
-#: mafiasi/mumble/templates/mumble/index.html:23
-msgid "The fingerprint of the current SSL certificate is:"
-msgstr "Der Fingerprint des aktuellen SSL-Zertifikats lautet:"
-
-#: mafiasi/jabber/templates/jabber/index.html:22
-msgid "Configure your Jabber Client"
-msgstr "Einrichtung deines Jabber-Clients"
-
-#: mafiasi/jabber/templates/jabber/index.html:24
-msgid ""
-"\n"
-"    In order to use Jabber, you need to install a Jabber client and "
-"configure it\n"
-"    to connect to the Mafiasi server. One option is <a href=\"https://gajim."
-"org\"\n"
-"    target=\"_blank\">Gajim</a>, which is recommended by us.\n"
-"  "
-msgstr ""
-"\n"
-"Um Jabber nutzen zu können, musst du einen Jabber-Client installieren und "
-"dort deinen Mafiasi-Zugang einrichten. Die von uns empfohlene Option ist <a "
-"href=\"https://gajim.org\" target=\"_blank\">Gajim</a>."
-
-#: mafiasi/jabber/templates/jabber/index.html:32
-msgid ""
-"\n"
-"    For Android systems, we recommend using\n"
-"    <a href=\"https://conversations.im\" target=\"_blank\">Conversations</"
-"a>, which is\n"
-"    a free Jabber client. It is available for free on F-Droid or paid on "
-"the\n"
-"    Play Store.\n"
-"  "
-msgstr ""
-"\n"
-"    Für Android-Systeme empfehlen wir\n"
-"    <a href=\"https://conversations.im\" target=\"_blank\">Conversations</"
-"a>, ein\n"
-"    freier Jabber-Client, der kostenlos über F-Droid und kostenpflichtig\n"
-"    im Play Store bezogen werden kann.\n"
-"\n"
-"  "
-
-#: mafiasi/jabber/templates/jabber/index.html:41
-msgid ""
-"\n"
-"    Below you can see the required configuration for Gajim, Dino, Pidgin and "
-"Conversations.\n"
-"  "
-msgstr ""
-"\n"
-"Unten findest du die nötigen Einstellungen für Gajim, Dino, Pidgin und "
-"Conversations."
-
 #: mafiasi/kanboard/apps.py:10
 msgid "Kanboard"
 msgstr "Kanboard"
@@ -1658,14 +1567,6 @@ msgstr ""
 "Matrix ermöglicht dezentrales Chatten und VoIP mit Ende-zu-Ende-"
 "Verschlüsselung."
 
-#: mafiasi/mattermost/apps.py:10
-msgid "Chat"
-msgstr "Chat"
-
-#: mafiasi/mattermost/apps.py:11
-msgid "An online team chat service"
-msgstr "Mattermost ist ein Online-Chatservice für Teams"
-
 #: mafiasi/mumble/apps.py:9 mafiasi/mumble/templates/mumble/index.html:5
 msgid "Mumble"
 msgstr "Mumble"
@@ -2098,30 +1999,6 @@ msgstr "Neue E-Mail-Adresse"
 msgid "Change Email"
 msgstr "Mailadresse ändern"
 
-#: mafiasi/registration/templates/registration/account.html:92
-msgid ""
-"Note: You can \"change\" your password to the current password to "
-"synchronize it with other services (e.g. Jabber)"
-msgstr ""
-"Hinweis: Du kannst dein Passwört auf das aktuelle Passwort \"ändern\", um es "
-"mit anderen Diensten zu synchronisieren (z.B. Jabber)"
-
-#: mafiasi/registration/templates/registration/account.html:96
-msgid "Old password"
-msgstr "Altes Passwort"
-
-#: mafiasi/registration/templates/registration/account.html:105
-msgid "New password"
-msgstr "Neues Passwort"
-
-#: mafiasi/registration/templates/registration/account.html:114
-msgid "New password confirmation"
-msgstr "Neues Passwort bestätigen"
-
-#: mafiasi/registration/templates/registration/account.html:125
-msgid "Change password"
-msgstr "Passwort ändern"
-
 #: mafiasi/registration/templates/registration/email_error.html:5
 msgid "Email address is invalid"
 msgstr "E-Mail-Adresse ist ungültig"
@@ -3046,18 +2923,6 @@ msgstr ""
 #~ msgid "e-mails"
 #~ msgstr "E-Mails"
 
-#, fuzzy
-#~| msgid ""
-#~| "You have to <a href=\"%(login_url)s?next=%(jabber_index_url)s\">login</"
-#~| "a> to create or manage your Jabber account."
-#~ msgid ""
-#~ "You have to <a href=\"%(login_url)s?next=%(jabber_index_url)s\">login</a> "
-#~ "to see your Jabber account data."
-#~ msgstr ""
-#~ "Du musst dich <a href=\"%(login_url)s?"
-#~ "next=%(jabber_index_url)s\">einloggen</a>, um deinen Jabber-Account zu "
-#~ "erstellen oder zu verwalten."
-
 #~ msgid "Mafiasi Hub"
 #~ msgstr "Mafiasi Hub"
 
@@ -3068,21 +2933,6 @@ msgstr ""
 #~ "Muss mit einem Buchstaben beginnen und nur alphanumerische Zeichen "
 #~ "enthalten. Nur Kleinbuchstaben."
 
-#~ msgid "Create Jabber account"
-#~ msgstr "Jabber-Account erstellen"
-
-#~ msgid ""
-#~ "To create your Jabber account you have to enter your current password:"
-#~ msgstr ""
-#~ "Um deinen Jabber-Account zu erstellen, musst du dein aktuelles Passwort "
-#~ "eingeben:"
-
-#~ msgid ""
-#~ "You can now <a href=\"%(create_url)s\">create your Jabber account</a>."
-#~ msgstr ""
-#~ "Du kannst nun deinen <a href=\"%(create_url)s\">Jabber-Account erstellen</"
-#~ "a>."
-
 #~ msgid "Account was created."
 #~ msgstr "Account wurde erstellt."
 
@@ -3250,14 +3100,5 @@ msgstr ""
 #~ msgid "Confirm password:"
 #~ msgstr "Passwort bestätigen:"
 
-#~ msgid "Reset password of your Jabber account"
-#~ msgstr "Jabber-Account-Passwort zurücksetzen"
-
-#~ msgid ""
-#~ "Enter your current password to set the Jabber password to the entered one."
-#~ msgstr ""
-#~ "Gib dein aktuelles Passwort ein, um das Jabber-Passwort auf dieses "
-#~ "zurückzusetzen."
-
 #~ msgid "Reset password"
 #~ msgstr "Passwort zurücksetzen"