diff options
| author | Antoine Ouvrard <antoine.ouvrard@nereide.fr> | 2020-04-20 21:00:38 +0200 |
|---|---|---|
| committer | Antoine Ouvrard <antoine.ouvrard@nereide.fr> | 2020-04-20 21:00:38 +0200 |
| commit | dd883c8c1aa13766525d8f1466a574f627d61829 (patch) | |
| tree | fb05e15c2e75ce856c9f5c27e372060f02b19532 /roles/common | |
| parent | 465876051e22fb7f986ff4ab7329c741382857bf (diff) | |
Resolve "execution des roles plus flexible"
Diffstat (limited to 'roles/common')
| -rw-r--r-- | roles/common/files/jail.conf | 10 | ||||
| -rw-r--r-- | roles/common/files/jitsi-letsencrypt.sh | 100 | ||||
| -rw-r--r-- | roles/common/files/nftables.conf | 35 | ||||
| -rw-r--r-- | roles/common/files/service-override.conf | 7 | ||||
| -rw-r--r-- | roles/common/handlers/main.yml | 13 | ||||
| -rw-r--r-- | roles/common/tasks/jitsi_conf.yml | 44 | ||||
| -rw-r--r-- | roles/common/tasks/jitsi_install.yml | 37 | ||||
| -rw-r--r-- | roles/common/tasks/jitsi_stats.yml | 26 | ||||
| -rw-r--r-- | roles/common/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/common/tasks/sys_conf.yml | 35 |
10 files changed, 0 insertions, 313 deletions
diff --git a/roles/common/files/jail.conf b/roles/common/files/jail.conf deleted file mode 100644 index 5cbf4b7..0000000 --- a/roles/common/files/jail.conf +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] - -backend = systemd -banaction = nftables-multiport - -# 92.154.111.181 - IP des bureaux de nereide -ignoreip = 127.0.0.1 92.154.111.181 -findtime = 1h -bantime = 1d -maxretry = 3
\ No newline at end of file diff --git a/roles/common/files/jitsi-letsencrypt.sh b/roles/common/files/jitsi-letsencrypt.sh deleted file mode 100644 index 13e2968..0000000 --- a/roles/common/files/jitsi-letsencrypt.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -set -e - -DEB_CONF_RESULT=`debconf-show jitsi-meet-web-config | grep jvb-hostname` -DOMAIN="${DEB_CONF_RESULT##*:}" -# remove whitespace -DOMAIN="$(echo -e "${DOMAIN}" | tr -d '[:space:]')" - -echo "-------------------------------------------------------------------------" -echo "This script will:" -echo "- Need a working DNS record pointing to this machine(for domain ${DOMAIN})" -echo "- Download certbot-auto from https://dl.eff.org to /usr/local/sbin" -echo "- Install additional dependencies in order to request Let’s Encrypt certificate" -echo "- If running with jetty serving web content, will stop Jitsi Videobridge" -echo "- Configure and reload nginx or apache2, whichever is used" -echo "- Configure the coturn server to use Let's Encrypt certificate and add required deploy hooks" -echo "- Add command in weekly cron job to renew certificates regularly" -echo "" -echo "You need to agree to the ACME server's Subscriber Agreement (https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf) " -echo "by providing an email address for important account notifications" - -#echo -n "Enter your email and press [ENTER]: " -#read EMAIL -EMAIL=supervision@nereide.fr - -cd /usr/local/sbin - -if [ ! -f certbot-auto ] ; then - wget https://dl.eff.org/certbot-auto - chmod a+x ./certbot-auto -fi - -CRON_FILE="/etc/cron.weekly/letsencrypt-renew" -if [ ! -d "/etc/cron.weekly" ] ; then - mkdir "/etc/cron.weekly" -fi -echo "#!/bin/bash" > $CRON_FILE -echo "/usr/local/sbin/certbot-auto renew >> /var/log/le-renew.log" >> $CRON_FILE - -CERT_KEY="/etc/letsencrypt/live/$DOMAIN/privkey.pem" -CERT_CRT="/etc/letsencrypt/live/$DOMAIN/fullchain.pem" - -if [ -f /etc/nginx/sites-enabled/$DOMAIN.conf ] ; then - - TURN_CONFIG="/etc/turnserver.conf" - TURN_HOOK=/etc/letsencrypt/renewal-hooks/deploy/0000-coturn-certbot-deploy.sh - if [ -f $TURN_CONFIG ] && grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then - mkdir -p $(dirname $TURN_HOOK) - - cp /usr/share/jitsi-meet-turnserver/coturn-certbot-deploy.sh $TURN_HOOK - chmod u+x $TURN_HOOK - sed -i "s/jitsi-meet.example.com/$DOMAIN/g" $TURN_HOOK - fi - - ./certbot-auto certonly --noninteractive \ - --webroot --webroot-path /usr/share/jitsi-meet \ - -d $DOMAIN \ - --agree-tos --email $EMAIL \ - --deploy-hook $TURN_HOOK - - echo "Configuring nginx" - - CONF_FILE="/etc/nginx/sites-available/$DOMAIN.conf" - CERT_KEY_ESC=$(echo $CERT_KEY | sed 's/\./\\\./g') - CERT_KEY_ESC=$(echo $CERT_KEY_ESC | sed 's/\//\\\//g') - sed -i "s/ssl_certificate_key\ \/etc\/jitsi\/meet\/.*key/ssl_certificate_key\ $CERT_KEY_ESC/g" \ - $CONF_FILE - CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g') - CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g') - sed -i "s/ssl_certificate\ \/etc\/jitsi\/meet\/.*crt/ssl_certificate\ $CERT_CRT_ESC/g" \ - $CONF_FILE - - echo "service nginx reload" >> $CRON_FILE - service nginx reload -elif [ -f /etc/apache2/sites-enabled/$DOMAIN.conf ] ; then - - ./certbot-auto certonly --noninteractive \ - --webroot --webroot-path /usr/share/jitsi-meet \ - -d $DOMAIN \ - --agree-tos --email $EMAIL - - echo "Configuring apache2" - - CONF_FILE="/etc/apache2/sites-available/$DOMAIN.conf" - CERT_KEY_ESC=$(echo $CERT_KEY | sed 's/\./\\\./g') - CERT_KEY_ESC=$(echo $CERT_KEY_ESC | sed 's/\//\\\//g') - sed -i "s/SSLCertificateKeyFile\ \/etc\/jitsi\/meet\/.*key/SSLCertificateKeyFile\ $CERT_KEY_ESC/g" \ - $CONF_FILE - CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g') - CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g') - sed -i "s/SSLCertificateFile\ \/etc\/jitsi\/meet\/.*crt/SSLCertificateFile\ $CERT_CRT_ESC/g" \ - $CONF_FILE - - echo "service apache2 reload" >> $CRON_FILE - service apache2 reload -fi - -# the cron file that will renew certificates -chmod a+x $CRON_FILE
\ No newline at end of file diff --git a/roles/common/files/nftables.conf b/roles/common/files/nftables.conf deleted file mode 100644 index 28f90cf..0000000 --- a/roles/common/files/nftables.conf +++ /dev/null @@ -1,35 +0,0 @@ - -#!/usr/sbin/nftables -f - -flush ruleset - -# family `inet` c'est pour ipv4/ipv6 -table inet myfilter { - chain myglobal { - # par défaut on accepte tous les paquets entrant - type filter hook input priority 0; policy accept; - # accepte les ping (mais pas plus de 1 par seconde) - ip protocol icmp icmp type { echo-request, echo-reply } limit rate 1/second accept - ip protocol icmp icmp type { echo-request, echo-reply } drop - ip6 nexthdr icmpv6 icmpv6 type { echo-request, echo-reply } limit rate 1/second accept - ip6 nexthdr icmpv6 icmpv6 type { echo-request, echo-reply } drop - # on accepte tout le reste du traffic icmp - ip protocol icmp accept - ip6 nexthdr icmpv6 accept - # accepte le traffic qui vient de nous - ct state established,related accept - ct state invalid drop - # accepte le traffic localhost - iif lo accept - # accepte tout le traffic ssh peut importe l'origine - tcp dport 22 accept - # accepte le traffic tcp depuis le reste du monde si la cible est un des ports http, https, smtp - tcp dport {25, 80, 443} accept - # ouvre les port udp I/O 10000 et 44446 pour jitsi - udp dport {10000, 4446} accept - udp sport {10000, 4446} accept - - # count and drop any other traffic - counter drop - } -} diff --git a/roles/common/files/service-override.conf b/roles/common/files/service-override.conf deleted file mode 100644 index 885915e..0000000 --- a/roles/common/files/service-override.conf +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -After=nftables.service -PartOf=nftables.service - -[Service] -ExecStartPre=nft add table inet filter -ExecStartPre=nft add chain inet filter input { type filter hook input priority 0; policy accept; } diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml deleted file mode 100644 index 6416e12..0000000 --- a/roles/common/handlers/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: restart fail2ban - systemd: - name: fail2ban - state: restarted - daemon_reload: true - enabled: true - -- name: restart nftables - systemd: - name: nftables - state: restarted - enabled: true diff --git a/roles/common/tasks/jitsi_conf.yml b/roles/common/tasks/jitsi_conf.yml deleted file mode 100644 index 267dc51..0000000 --- a/roles/common/tasks/jitsi_conf.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- name: Configuration de let's encrypt - script: files/jitsi-letsencrypt.sh > jitsi-letsencrypt.log - -- name: Conf Jitsi - UI en fr - lineinfile: - path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js - insertafter: "[^?]// defaultLanguage: 'en'" - line: " defaultLanguage: 'fr'," - -- name: Conf Jitsi - webcam en qualité medium par defaut 1/2 - lineinfile: - path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js - insertafter: "[^?]// resolution: 720" - line: " resolution: 360," - -- name: Conf Jitsi - webcam en qualité medium par defaut 2/2 - blockinfile: - path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js - marker: "// {mark} ANSIBLE MANAGED BLOCK" - insertafter: "// ratio of 16:9 with an ideal resolution of 720." - block: | - constraints: { - video: { - aspectRatio: 16 / 9, - height: { - ideal: 360, - max: 360, - min: 240 - } - } - }, - -- name: Conf Jitsi - Désactive l'effet floutage d'arrière plan - replace: - path: /usr/share/jitsi-meet/interface_config.js - regexp: "'videobackgroundblur'," - replace: "" - -- name: Conf Jitsi - Active une alerte pour les utilisateurs de Firefox - replace: - path: /usr/share/jitsi-meet/interface_config.js - regexp: "'firefox'," - replace: "" diff --git a/roles/common/tasks/jitsi_install.yml b/roles/common/tasks/jitsi_install.yml deleted file mode 100644 index 5e319c2..0000000 --- a/roles/common/tasks/jitsi_install.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: installation de gpg si requis - apt: - name: - - gnupg2 - - apt-transport-https - state: present - -- name: Ajout de la clé GPG pour le depot jitsi - apt_key: - url: http://download.jitsi.org/jitsi-key.gpg.key - -- name: Ajout du depot jitsi - apt_repository: - repo: deb https://download.jitsi.org stable/ - -- name: apt update - apt: - update_cache: true - -- name: Application du hostname avant installation - debconf: - name: jitsi-meet-web-config - question: jitsi-videobridge/jvb-hostname - value: '{{ inventory_hostname }}' - vtype: string - -- name: On veut un certificat autogénéré - debconf: - name: jitsi-meet-web-config - question: jitsi-meet/cert-choice - value: "Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)" - vtype: string - -- name: installation de jitsi - apt: - name: jitsi-meet diff --git a/roles/common/tasks/jitsi_stats.yml b/roles/common/tasks/jitsi_stats.yml deleted file mode 100644 index ccb75df..0000000 --- a/roles/common/tasks/jitsi_stats.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -## activation des stats - -- name: configuration du videobridge pour activer les stats - lineinfile: - path: "/etc/jitsi/videobridge/sip-communicator.properties" - regexp: "^org.jitsi.videobridge.ENABLE_STATISTICS" - line: "org.jitsi.videobridge.ENABLE_STATISTICS=true" - -- name: configuration du videobridge pour transporter les stats via colibri REST api - lineinfile: - path: "/etc/jitsi/videobridge/sip-communicator.properties" - regexp: "^org.jitsi.videobridge.STATISTICS_TRANSPORT" - line: "org.jitsi.videobridge.STATISTICS_TRANSPORT=muc,colibri" - -- name: bloque l'accès à l'api colibri depuis l'extérieur - lineinfile: - path: "/etc/jitsi/videobridge/sip-communicator.properties" - regexp: "^org.jitsi.videobridge.rest.private.jetty.host" - line: "org.jitsi.videobridge.rest.private.jetty.host=localhost" - -- name: ajoute l'api REST à la config de démarrage du videobridge - lineinfile: - path: "/etc/jitsi/videobridge/config" - regexp: "^JVB_OPTS=" - line: 'JVB_OPTS=" --apis=rest "' diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml deleted file mode 100644 index 19598cf..0000000 --- a/roles/common/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- include_tasks: sys_conf.yml -- include_tasks: jitsi_install.yml -- include_tasks: jitsi_conf.yml -- include_tasks: jitsi_stats.yml - diff --git a/roles/common/tasks/sys_conf.yml b/roles/common/tasks/sys_conf.yml deleted file mode 100644 index 5dbaf59..0000000 --- a/roles/common/tasks/sys_conf.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -- name: Installation de fail2ban et nftables - apt: - pkg: - - fail2ban - - nftables - update_cache: true - state: present - -- name: Appliquation des règles de ban ssh - template: - src: ../files/jail.conf - dest: /etc/fail2ban/jail.d/jail.conf - notify: - - restart fail2ban - -- name: Création du répertoire pour la surcharge systemd - file: - name: /etc/systemd/system/fail2ban.service.d - state: directory - -- name: Règle de base pour nftables - template: - src: ../files/service-override.conf - dest: /etc/systemd/system/fail2ban.service.d/override.conf - -- name: Déploiement des règles nftables (base) - tags: - - nftables - template: - src: ../files/nftables.conf - dest: /etc/nftables.conf - notify: - - restart nftables - - restart fail2ban |
