Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

# Conflicts:
#	common/borgbackup/tasks/main.yml
#	common/borgbackup/templates/borgbackup-check.sh
#	common/borgbackup/templates/borgbackup-create.sh
#	common/borgbackup/templates/borgbackup-delete.sh
#	common/borgbackup/templates/borgbackup-info.sh
#	common/borgbackup/templates/borgbackup-init.sh
#	common/borgbackup/templates/borgbackup-list.sh
#	common/borgbackup/templates/borgbackup-mount.sh
#	common/borgbackup/templates/borgbackup-prometheus.sh

webserver/docker_jabber_test/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  auth:
+
+    image: dweomer/saslauthd
+    restart: always
+    volumes:
+      - /srv/jabber_test/saslauthd.conf:/etc/saslauthd.conf:ro
+      - /srv/jabber_test/saslauthd:/var/run/saslauthd
+
+  app:
+
+    image: prosody/prosody:0.10
+    restart: always
+    ports:
+      - 25222:5222
+      - 25269:5269
+    volumes:
+      - /srv/jabber_test/etc:/etc/prosody
+      - /srv/jabber_test/logs:/var/log/prosody
+      - /srv/jabber_test/data:/var/lib/prosody
+      # mount the certificates created by lets encrypt
+      - /etc/ssl/key.pem:/etc/prosody/certs/jabber-test.warpzone.ms.key
+      - /etc/ssl/fullchain.pem:/etc/prosody/certs/jabber-test.warpzone.ms.crt
+      - /etc/ssl/key.pem:/etc/prosody/certs/muc.jabber-test.warpzone.ms.key
+      - /etc/ssl/fullchain.pem:/etc/prosody/certs/muc.jabber-test.warpzone.ms.crt
+      - /etc/ssl/key.pem:/etc/prosody/certs/proxy.jabber-test.warpzone.ms.key
+      - /etc/ssl/fullchain.pem:/etc/prosody/certs/proxy.jabber-test.warpzone.ms.crt
+      # sasl2 auth mounts
+      - /srv/jabber_test/prosody.conf:/usr/lib/sasl/prosody.conf
+      - /srv/jabber_test/saslauthd:/var/run/saslauthd

webserver/docker_jabber_test/templates/prosody.cfg.lua

+---------- Server-wide settings ----------
+-- Settings in this section apply to the whole server and are the default settings
+-- for any virtual hosts
+
+-- This is a (by default, empty) list of accounts that are admins
+-- for the server. Note that you must create the accounts separately
+-- (see https://prosody.im/doc/creating_accounts for info)
+-- Example: admins = { "user1@example.com", "user2@example.net" }
+admins = { "sandzwerg@jabber.warpzone.ms", "void@jabber.warpzone.ms" }
+
+-- Enable use of libevent for better performance under high load
+-- For more information see: https://prosody.im/doc/libevent
+-- use_libevent = true
+
+-- Prosody will always look in its source directory for modules, but
+-- this option allows you to specify additional locations where Prosody
+-- will look for modules first. For community modules, see https://modules.prosody.im/
+--plugin_paths = {}
+
+-- This is the list of modules Prosody will load on startup.
+-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
+modules_enabled = {
+
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+
+	-- Not essential, but recommended
+		"carbons"; -- Keep multiple clients in sync
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"blocklist"; -- Allow users to block communications with other users
+		"vcard"; -- Allow users to set vCards
+
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"register"; -- Allow users to register on this server using a client and change passwords
+		--"mam"; -- Store messages in an archive and allow users to access it
+
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+
+	-- HTTP modules
+		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"websocket"; -- XMPP over WebSockets
+		--"http_files"; -- Serve static files from a directory over HTTP
+
+	-- Other specific functionality
+		--"limits"; -- Enable bandwidth limiting for XMPP connections
+		"groups"; -- Shared roster support
+		--"server_contact_info"; -- Publish contact information for this service
+		"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+		"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
+}
+
+-- These modules are auto-loaded, but should you want
+-- to disable them then uncomment them here:
+modules_disabled = {
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
+	"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+}
+
+-- Disable account creation by default, for security
+-- For more information see https://prosody.im/doc/creating_accounts
+allow_registration = false
+
+-- Force clients to use encrypted connections? This option will
+-- prevent clients from authenticating unless they are using encryption.
+
+c2s_require_encryption = true
+
+-- Force servers to use encrypted connections? This option will
+-- prevent servers from authenticating unless they are using encryption.
+-- Note that this is different from authentication
+
+s2s_require_encryption = true
+
+
+-- Force certificate authentication for server-to-server connections?
+-- This provides ideal security, but requires servers you communicate
+-- with to support encryption AND present valid, trusted certificates.
+-- NOTE: Your version of LuaSec must support certificate verification!
+-- For more information see https://prosody.im/doc/s2s#security
+
+s2s_secure_auth = false
+
+-- Some servers have invalid or self-signed certificates. You can list
+-- remote domains here that will not be required to authenticate using
+-- certificates. They will be authenticated using DNS instead, even
+-- when s2s_secure_auth is enabled.
+
+--s2s_insecure_domains = { "insecure.example" }
+
+-- Even if you leave s2s_secure_auth disabled, you can still require valid
+-- certificates for some domains by specifying a list here.
+
+--s2s_secure_domains = { "jabber.org" }
+
+-- Select the authentication backend to use. The 'internal' providers
+-- use Prosody's configured data storage to store the authentication data.
+-- To allow Prosody to offer secure authentication mechanisms to clients, the
+-- default provider stores passwords in plaintext. If you do not trust your
+-- server please see https://prosody.im/doc/modules/mod_auth_internal_hashed
+-- for information about using the hashed backend.
+
+-- authentication = "internal_hashed"
+
+authentication = "cyrus" 
+cyrus_service_name = "xmpp" -- Optional, defaults to "xmpp"
+
+-- Select the storage backend to use. By default Prosody uses flat files
+-- in its configured data directory, but it also supports more backends
+-- through modules. An "sql" backend is included by default, but requires
+-- additional dependencies. See https://prosody.im/doc/storage for more info.
+
+--storage = "sql" -- Default is "internal"
+
+-- For the "sql" backend, you can uncomment *one* of the below to configure:
+--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
+--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
+--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
+
+
+-- Archiving configuration
+-- If mod_mam is enabled, Prosody will store a copy of every message. This
+-- is used to synchronize conversations between multiple clients, even if
+-- they are offline. This setting controls how long Prosody will keep
+-- messages in the archive before removing them.
+
+archive_expires_after = "1w" -- Remove archived messages after 1 week
+
+-- You can also configure messages to be stored in-memory only. For more
+-- archiving options, see https://prosody.im/doc/modules/mod_mam
+
+-- Logging configuration
+-- For advanced logging see https://prosody.im/doc/logging
+log = {
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	-- info = "*console"; -- Log to the console
+	"*console"; -- Log to the console, useful for debugging with daemonize=false
+	-- "*syslog"; -- Uncomment this for logging to syslog
+}
+
+-- Uncomment to enable statistics
+-- For more info see https://prosody.im/doc/statistics
+-- statistics = "internal"
+
+-- Certificates
+-- Every virtual host and component needs a certificate so that clients and
+-- servers can securely verify its identity. Prosody will automatically load
+-- certificates/keys from the directory specified here.
+-- For more information, including how to use 'prosodyctl' to auto-import certificates
+-- (from e.g. Let's Encrypt) see https://prosody.im/doc/certificates
+
+-- Location of directory to find certificates in (relative to main config file):
+certificates = "certs"
+
+----------- Virtual hosts -----------
+-- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+-- Settings under each VirtualHost entry apply *only* to that host.
+
+VirtualHost "jabber-test.warpzone.ms"
+
+--VirtualHost "example.com"
+--	certificate = "/path/to/example.crt"
+
+------ Components ------
+-- You can specify components to add hosts that provide special services,
+-- like multi-user conferences, and transports.
+-- For more information on components, see https://prosody.im/doc/components
+
+--- Set up a MUC (multi-user chat) room server on conference.example.com:
+Component "muc.jabber-test.warpzone.ms" "muc"
+
+--- Configure the proxy65 component which allows file transfers
+ Component "proxy.jabber-test.warpzone.ms" "proxy65"
+
+--- Configure where the groups are stated
+  groups_file = "/etc/prosody/groups.txt"
+
+--- Configure the posix module so it works with docker
+--  daemonize = false
+--  pidfile = "/tmp/prosody.pid"
+
+---Set up an external component (default component port is 5347)
+--
+-- External components allow adding various services, such as gateways/
+-- transports to other networks like ICQ, MSN and Yahoo. For more info
+-- see: https://prosody.im/doc/components#adding_an_external_component
+--
+--Component "gateway.example.com"
+--	component_secret = "password"

webserver/docker_jabber_test/templates/prosody.conf

+pwcheck_method: saslauthd
+mech_list: PLAIN
\ No newline at end of file

webserver/docker_jabber_test/templates/saslauthd.conf

+
+ldap_servers: ldap://{{ ldap_ip_ext }}
+ldap_search_base: {{ ldap_base_dn }}
+ldap_filter: (&(objectClass=inetOrgPerson)(memberof=CN=active,OU=groups,{{ ldap_base_dn }})(uid=%u))
+ldap_bind_dn: {{ ldap_readonly_bind_dn }}
+ldap_password: {{ ldap_readonly_pass }}

webserver/docker_matterbridge/templates/matterbridge.toml

@@ -79,6 +79,7 @@ ShowJoinPart=false
 #REQUIRED
 [telegram.bot]
 #Token to connect with telegram API
+#Bot @warpzonebot
 #See https://core.telegram.org/bots#6-botfather and https://www.linkedin.com/pulse/telegram-bots-beginners-marco-frau
 #REQUIRED
 Token="{{ telegram_token }}"
@@ -162,13 +163,14 @@ enable=true
     #account="mattermost.warpzone"
     #channel="town-square"
 
-    #[[gateway.inout]]
-    ## Telegramm Gruppe @warpzone
-    ## 8.8.2017 von void deaaktiviert das das Spammen im Telegram leite genervt hat
+    [[gateway.inout]]
+    ## Telegramm Gruppe @warpzone (Spamfreie Warpzone Gruppe)
+    ## 8.8.2017 von void deaaktiviert das das Spammen im Telegram Leute genervt hat
+    ## 24.4.2018 für die spamfreie warpzone Gruppe wieder aktiviert (Beschluss Plenum)
     ## Vorgehen um Guppen-ID zu bekommen:
     ## - Bot in Gruppe einfügen
     ## - Chatnachricht erstellen  
     ## - https://api.telegram.org/<API Token>/getUpdates ausrufen, die ID findet sich in der Eigenschaft "message.chat.id"
-    #account="telegram.bot"
-    #channel="-199147565" 
+    account="telegram.bot"
+    channel="-272574265" 
 

webserver/main.yml

@@ -4,15 +4,16 @@
   remote_user: root
   roles:
     - { role: ../common/borgbackup, tags: borgbackup }
+    - { role: ../common/docker, tags: docker }
     - { role: nginx, tags: nginx }
     - { role: openvpn, tags: openvpn }
-    - { role: docker, tags: docker }
     - { role: docker_dokuwiki, tags: dokuwiki }
     - { role: docker_etherpad, tags: etherpad }
     - { role: docker_gitlab, tags: gitlab }
+    - { role: docker_jabber, tags: jabber }
+    - { role: docker_jabber_test, tags: jabber_test }
     - { role: docker_ldap, tags: ldap }
     - { role: docker_matterbridge, tags: matterbridge }
     - { role: docker_warpinfra, tags: warpinfra }
     - { role: docker_warpinfratest, tags: warpinfratest }
     - { role: docker_wordpress, tags: wordpress }
-    

webserver/nginx/templates/letsencrypt.sh

 #!/bin/bash
 
-cd /opt/simp_le/ 
-if [ ! -e venv/bin/python ]; then ./venv.sh; fi 
+cd /opt/simp_le/
+if [ ! -e venv/bin/python ]; then ./venv.sh; fi
 
-cd /etc/ssl 
-PATH=/opt/simp_le/venv/bin:/usr/sbin:/usr/bin:/sbin:/bin 
-
-simp_le --email {{ letsencrypt_mail }} -f account_key.json -f key.pem -f fullchain.pem --tos_sha256 {{ letsencrypt_tos_sha256 }} {% for domain in webserver_domains %} -d {{ domain }}.warpzone.ms:/var/www/html {% endfor %} && systemctl reload nginx
+cd /etc/ssl
+PATH=/opt/simp_le/venv/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+simp_le --email {{ letsencrypt_mail }} -f account_key.json -f key.pem -f fullchain.pem --tos_sha256 {{ letsencrypt_tos_sha256 }} {% for domain in webserver_domains %} -d {{ domain }}.warpzone.ms:/var/www/html {% endfor %} && systemctl reload nginx && /usr/local/bin/docker-compose -f /srv/jabber_test/docker-compose.yml restart && /usr/local/bin/docker-compose -f /srv/jabber/docker-compose.yml