diff --git a/production/hosts b/production/hosts index d3fb037..6ed2a1c 100644 --- a/production/hosts +++ b/production/hosts @@ -44,6 +44,7 @@ bt.dmz.mateu.be web_hostname="['sonarr.mateu.be','bt.mateu.be','btf.mateu.be']" web1.dmz.mateu.be web_hostname="['fav.libertus.eu', 'rss.libertus.eu', 'o.libertus.eu', 'blog.libertus.eu', 'mail.libertus.eu', 'perso.nintendojo.fr', 'perso.libertus.eu', 'r.mateu.be','coince.mateu.be', 'z.libertus.eu', 'autodiscover.libertus.eu']" web2.dmz.mateu.be web_hostname="['analyse.nintendojo.fr', 'nintendojo.fr', 'www.nintendojo.fr', 'forum.nintendojo.fr', 'intendo.fr', 'www.intendo.fr']" ror.dmz.mateu.be web_hostname="['m.nintendojo.fr']" +jabber.dmz.mateu.be web_hostname="['libertus.eu', 'upload.libertus.eu', 'xmpp.libertus.eu']" #mail.dmz.mateu.be [phpservers] @@ -63,6 +64,9 @@ ror.dmz.mateu.be [mailservers] mail.dmz.mateu.be +[xmppservers] +jabber.dmz.mateu.be + [loadbalancers] haproxy.dmz.mateu.be diff --git a/roles/dovecot/files/dovecot.conf b/roles/dovecot/files/dovecot.conf index 77ce0a5..4fafae7 100644 --- a/roles/dovecot/files/dovecot.conf +++ b/roles/dovecot/files/dovecot.conf @@ -33,7 +33,7 @@ plugin { service auth { inet_listener { - address = 127.0.0.1 ::1 + address = * [::] port = 26 } } diff --git a/roles/firewall/templates/firewall.j2 b/roles/firewall/templates/firewall.j2 index 65e84e1..1171f49 100644 --- a/roles/firewall/templates/firewall.j2 +++ b/roles/firewall/templates/firewall.j2 @@ -122,35 +122,25 @@ config rule option target 'ACCEPT' option family 'ipv6' -config rule - option name 'n0box2-XMPP-c2s+s2s' - option src 'wan' - option proto 'tcpudp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv6']['address'] }}' - option dest_port '5222 5269' - option target 'ACCEPT' - option family 'ipv6' +#config rule +# option name 'n0box2-TS-com+com2' +# option src 'wan' +# option proto 'tcp' +# option dest 'lan' +# option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv6']['address'] }}' +# option dest_port '10011 30033' +# option target 'ACCEPT' +# option family 'ipv6' -config rule - option name 'n0box2-TS-com+com2' - option src 'wan' - option proto 'tcp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv6']['address'] }}' - option dest_port '10011 30033' - option target 'ACCEPT' - option family 'ipv6' - -config rule - option name 'n0box2-TS-signal' - option src 'wan' - option proto 'udp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv6']['address'] }}' - option dest_port '9987' - option target 'ACCEPT' - option family 'ipv6' +#config rule +# option name 'n0box2-TS-signal' +# option src 'wan' +# option proto 'udp' +# option dest 'lan' +# option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv6']['address'] }}' +# option dest_port '9987' +# option target 'ACCEPT' +# option family 'ipv6' config rule option name 'n0box2-mumble' @@ -212,55 +202,35 @@ config redirect option dest_port '993' option target 'DNAT' -config redirect - option name 'n0box2-XMPP-c2s' - option src 'wan' - option src_dport '5222' - option proto 'tcpudp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' - option dest_port '5222' - option target 'DNAT' +#config redirect +# option name 'n0box2-TS-com' +# option src 'wan' +# option src_dport '10011' +# option proto 'tcp' +# option dest 'lan' +# option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' +# option dest_port '10011' +# option target 'DNAT' -config redirect - option name 'n0box2-XMPP-s2s' - option src 'wan' - option src_dport '5269' - option proto 'tcpudp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' - option dest_port '5269' - option target 'DNAT' +#config redirect +# option name 'n0box2-TS-com2' +# option src 'wan' +# option src_dport '30033' +# option proto 'tcp' +# option dest 'lan' +# option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' +# option dest_port '30033' +# option target 'DNAT' -config redirect - option name 'n0box2-TS-com' - option src 'wan' - option src_dport '10011' - option proto 'tcp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' - option dest_port '10011' - option target 'DNAT' - -config redirect - option name 'n0box2-TS-com2' - option src 'wan' - option src_dport '30033' - option proto 'tcp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' - option dest_port '30033' - option target 'DNAT' - -config redirect - option name 'n0box2-TS-signal' - option src 'wan' - option src_dport '9987' - option proto 'udp' - option dest 'lan' - option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' - option dest_port '9987' - option target 'DNAT' +#config redirect +# option name 'n0box2-TS-signal' +# option src 'wan' +# option src_dport '9987' +# option proto 'udp' +# option dest 'lan' +# option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' +# option dest_port '9987' +# option target 'DNAT' config redirect option name 'n0box2-mumble' @@ -355,7 +325,7 @@ config rule option proto 'tcpudp' option dest 'lan' option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv4']['address'] }}' - option dest_port '25 80 443 465 587 143 993' + option dest_port '25 26 80 443 465 587 143 993' option target 'ACCEPT' option family 'ipv4' @@ -365,7 +335,7 @@ config rule option proto 'tcpudp' option dest 'lan' option dest_ip '{{ hostvars['n0box2.mateu.be']['ansible_default_ipv6']['address'] }}' - option dest_port '25 80 443 465 587 143 993' + option dest_port '25 26 80 443 465 587 143 993' option target 'ACCEPT' option family 'ipv6' @@ -467,6 +437,57 @@ config rule option target 'ACCEPT' option family 'ipv4' +# Allow XMPP traffic +config rule + option name 'Allow-OUTPUT-XMPP-s2s' + option src 'dmz' + option src_ip '{{ hostvars['jabber.dmz.mateu.be']['ansible_default_ipv4']['address']}}' + option proto 'tcpudp' + option dest 'wan' + option dest_port '5269' + option target 'ACCEPT' + option family 'ipv4' + +config rule + option name 'Allow-OUTPUT-XMPP-s2s' + option src 'dmz' + option src_ip '{{ hostvars['jabber.dmz.mateu.be']['ansible_default_ipv6']['address'] }}' + option proto 'tcpudp' + option dest 'wan' + option dest_port '5269' + option target 'ACCEPT' + option family 'ipv6' + +config redirect + option name 'Allow-INPUT-XMPP-c2s' + option src 'wan' + option src_dport '5222' + option proto 'tcpudp' + option dest 'dmz' + option dest_ip '{{ hostvars['jabber.dmz.mateu.be']['ansible_default_ipv4']['address'] }}' + option dest_port '5222' + option target 'DNAT' + +config redirect + option name 'Allow-INPUT-XMPP-s2s' + option src 'wan' + option src_dport '5269' + option proto 'tcpudp' + option dest 'dmz' + option dest_ip '{{ hostvars['jabber.dmz.mateu.be']['ansible_default_ipv4']['address'] }}' + option dest_port '5269' + option target 'DNAT' + +config rule + option name 'Allow-INPUT-XMPP-c2s+s2s' + option src 'wan' + option proto 'tcpudp' + option dest 'dmz' + option dest_ip '{{ hostvars['jabber.dmz.mateu.be']['ansible_default_ipv6']['address'] }}' + option dest_port '5222 5269' + option target 'ACCEPT' + option family 'ipv6' + ## Default configuration config defaults option syn_flood '1' diff --git a/roles/nginx/templates/vhosts/libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/libertus.eu.conf.j2 new file mode 100644 index 0000000..e69de29 diff --git a/roles/nginx/templates/vhosts/upload.libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/upload.libertus.eu.conf.j2 new file mode 100644 index 0000000..86a0fdb --- /dev/null +++ b/roles/nginx/templates/vhosts/upload.libertus.eu.conf.j2 @@ -0,0 +1,10 @@ +server { +{% include './templates/header.conf.j2' %} + client_max_body_size 10M; + + location / { + proxy_pass http://localhost:5280; + include proxy_params; + } +} + diff --git a/roles/nginx/templates/vhosts/xmpp.libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/xmpp.libertus.eu.conf.j2 new file mode 100644 index 0000000..10df77e --- /dev/null +++ b/roles/nginx/templates/vhosts/xmpp.libertus.eu.conf.j2 @@ -0,0 +1,12 @@ +server { +{% include './templates/header.conf.j2' %} + client_max_body_size 10M; + + location /http-bind { + proxy_pass http://localhost:5280/http-bind; + include proxy_params; + proxy_buffering off; + tcp_nodelay on; + } +} + diff --git a/roles/xmpp/files/prosody.cfg.lua b/roles/xmpp/files/prosody.cfg.lua new file mode 100644 index 0000000..2748ca7 --- /dev/null +++ b/roles/xmpp/files/prosody.cfg.lua @@ -0,0 +1,234 @@ +-- Prosody Example Configuration File +-- +-- Information on configuring Prosody can be found on our +-- website at http://prosody.im/doc/configure +-- +-- Tip: You can check that the syntax of this file is correct +-- when you have finished by running: luac -p prosody.cfg.lua +-- If there are any errors, it will let you know what and where +-- they are, otherwise it will keep quiet. +-- +-- The only thing left to do is rename this file to remove the .dist ending, and fill in the +-- blanks. Good luck, and happy Jabbering! + + +---------- 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 http://prosody.im/doc/creating_accounts for info) +-- Example: admins = { "user1@example.com", "user2@example.net" } +admins = { } + +-- Enable use of libevent for better performance under high load +-- For more information see: http://prosody.im/doc/libevent +--use_libevent = true; + +-- 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 on modules can be found at: http://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 + "private"; -- Private XML storage (for room bookmarks, etc.) + "vcard"; -- Allow users to set vCards + "cloud_notify"; -- XEP-0357 + "mam"; -- XEP-0313 + "csi"; -- XEP-0352 + + -- These are commented by default as they have a performance impact + --"privacy"; -- Support privacy lists + --"compression"; -- Stream compression (Debian: requires lua-zlib module to work) + + -- 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 + "pep"; -- Enables users to publish their mood, activity, playing music and more + -- "register"; -- Allow users to register on this server using a client and change passwords + + -- 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" + "http_upload"; -- Enable HTTP upload XEP-0353 + --"http_files"; -- Serve static files from a directory over HTTP + + -- Other specific functionality + "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + "carbons"; -- maintain conversations between devices + "smacks"; -- XEP-0195 + --"groups"; -- Shared roster support + --"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. +}; + +-- 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 +}; + +-- Disable account creation by default, for security +-- For more information see http://prosody.im/doc/creating_accounts +allow_registration = false; + +-- Debian: +-- send the server to background. +-- +daemonize = true; + +-- Debian: +-- Please, don't change this option since /var/run/prosody/ +-- is one of the few directories Prosody is allowed to write to +-- +pidfile = "/var/run/prosody/prosody.pid"; + +-- These are the SSL/TLS-related settings. If you don't want +-- to use SSL/TLS, you may comment or remove this +ssl = { + key = "/etc/prosody/certs/privkey.pem"; + certificate = "/etc/prosody/certs/fullchain.pem"; + dhparam = "/etc/prosody/certs/dh-2048.pem"; + options = { "no_sslv2", "no_sslv3", "no_ticket", "no_compression", + "cipher_server_preference", "single_dh_use", + "single_ecdh_use" }; + ciphers = "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH EDH+aRSA !RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"; +} + +-- Secure Bosh +consider_bosh_secure = true + +-- Force clients to use encrypted connections? This option will +-- prevent clients from authenticating unless they are using encryption. + +c2s_require_encryption = true +s2s_require_encryption = false + +-- 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 http://prosody.im/doc/s2s#security + +s2s_secure_auth = false + +-- Many servers don't support encryption or have invalid or self-signed +-- certificates. You can list domains here that will not be required to +-- authenticate using certificates. They will be authenticated using DNS. + +--s2s_insecure_domains = { "gmail.com" } + +-- 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 http://prosody.im/doc/modules/mod_auth_internal_hashed +-- for information about using the hashed backend. + +anonymous_login = false +allow_unencrypted_plain_auth = false +authentication = "dovecot" +dovecot_auth_host = "imap.libertus.eu" +dovecot_auth_port = 26 + +-- 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 http://prosody.im/doc/storage for more info. + +--storage = "sql" -- Default is "internal" (Debian: "sql" requires one of the +-- lua-dbi-sqlite3, lua-dbi-mysql or lua-dbi-postgresql packages to work) + +-- 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" } + +-- Logging configuration +-- For advanced logging see http://prosody.im/doc/logging +-- +-- Debian: +-- Logs info and higher to /var/log +-- Logs errors to syslog also +log = { + -- Log files (change 'info' to 'debug' for debug logs): + info = "/var/log/prosody/prosody.log"; + error = "/var/log/prosody/prosody.err"; + -- Syslog: + { levels = { "error" }; to = "syslog"; }; +} + +----------- 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 "libertus.eu" + -- Assign this host a certificate for TLS, otherwise it would use the one + -- set in the global section (if any). + -- Note that old-style SSL on port 5223 only supports one certificate, and will always + -- use the global one. + -- ssl = { + -- key = "/etc/prosody/certs/example.com.key"; + -- certificate = "/etc/prosody/certs/example.com.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 http://prosody.im/doc/components + +---Set up a MUC (multi-user chat) room server on conference.example.com: +Component "conference.libertus.eu" "muc" +restrict_room_creation = "local" +muc_room_default_public = false +muc_room_default_persistent = true +muc_room_default_members_only = true +muc_room_default_public_jids = true + +-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: +--Component "proxy.example.com" "proxy65" + +---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: http://prosody.im/doc/components#adding_an_external_component +-- +--Component "gateway.example.com" +-- component_secret = "password" + +Component "upload.libertus.eu" "http_upload" +http_external_url = "https://upload.libertus.eu" +http_upload_file_size_limit = 10 * 1024 * 1024 +http_upload_expire_after = 60 * 60 * 24 * 7 +http_upload_allowed_file_types = { "image/*", "text/plain" } + +------ Additional config files ------ +-- For organizational purposes you may prefer to add VirtualHost and +-- Component definitions in their own config files. This line includes +-- all config files in /etc/prosody/conf.d/ + +Include "conf.d/*.cfg.lua" diff --git a/roles/xmpp/handlers/main.yml b/roles/xmpp/handlers/main.yml new file mode 100644 index 0000000..94d2818 --- /dev/null +++ b/roles/xmpp/handlers/main.yml @@ -0,0 +1,4 @@ +- name: restart prosody + service: + name: prosody + state: restarted diff --git a/roles/xmpp/tasks/main.yml b/roles/xmpp/tasks/main.yml new file mode 100644 index 0000000..a823d40 --- /dev/null +++ b/roles/xmpp/tasks/main.yml @@ -0,0 +1,27 @@ +- name: install prosody + package: + name: "{{ item }}" + state: present + loop: + - prosody + - prosody-modules + +- name: create dhparam + shell: /usr/bin/openssl dhparam -out /etc/prosody/certs/dh-2048.pem 2048 + args: + creates: /etc/prosody/certs/dh-2048.pem + +- name: right management for dh params + file: + path: /etc/prosody/certs/dh-2048.pem + owner: root + group: prosody + mode: '0640' + +- name: prosody configuration files + copy: + src: ./files/prosody.cfg.lua + dest: /etc/prosody/prosody.cfg.lua + notify: + - restart prosody + diff --git a/site.yml b/site.yml index 0dd5d75..c2bd8cc 100644 --- a/site.yml +++ b/site.yml @@ -3,6 +3,8 @@ - import_playbook: borgbackup.yml - import_playbook: nut.yml - import_playbook: firewall.yml +- import_playbook: mail.yml +- import_playbook: xmpp.yml - import_playbook: webservers.yml - import_playbook: loadbalancinghttp.yml - import_playbook: docker.yml diff --git a/xmpp.yml b/xmpp.yml new file mode 100644 index 0000000..fe42f23 --- /dev/null +++ b/xmpp.yml @@ -0,0 +1,3 @@ +- hosts: xmppservers + roles: + - xmpp