From 90dd3bad6429c11222b5a1c0a8f6c9d7ba77f135 Mon Sep 17 00:00:00 2001 From: Adrian Amaglio Date: Mon, 28 Aug 2023 20:25:32 +0200 Subject: [PATCH] new step for jean-cloud kind --- installing/debootstrap_ordis_portables.sh | 16 +- .../deploy_all/files/bin/deploy_service.sh | 156 +++++++++++++++++ .../roles/deploy_all/files/bin/deployer.sh | 159 +++--------------- .../deploy_all/files/bin/driglibash-base | 4 +- .../roles/deploy_all/files/bin/gen_env.sh | 28 +++ .../roles/deploy_all/files/bin/git_update.sh | 42 +++++ .../roles/deploy_all/files/bin/hugo_rclone.sh | 14 ++ .../roles/deploy_all/files/bin/jcservice.sh | 22 +++ .../deploy_all/files/bin/restart_nginx.sh | 24 +++ .../deploy_all/files/bind/db.etrevivant.net | 10 +- .../deploy_all/files/bind/db.jean-cloud.net | 21 +-- .../deploy_all/files/bind/db.jean-cloud.org | 16 +- .../deploy_all/files/bind/db.karnaval.fr | 6 +- .../roles/deploy_all/files/bind/db.lalis.fr | 15 -- .../deploy_all/files/bind/db.oma-radio.fr | 6 +- .../deploy_all/files/bind/named.conf.local | 5 - provisioning/roles/deploy_all/tasks/main.yml | 5 + .../roles/jean-cloud-common/tasks/main.yml | 12 +- readme.md | 5 +- services/deployer.jean-cloud.org/deploy.sh | 2 + .../{nginx.conf => nginx_server.conf} | 9 +- services/deployer.jean-cloud.org/server.sh | 38 +++++ services/etrevivant.net/.env | 1 + services/etrevivant.net/deploy_http.sh | 18 ++ services/etrevivant.net/install.sh | 25 --- services/grapes.chahut.jean-cloud.net/.env | 2 + .../grapes.chahut.jean-cloud.net/deploy.sh | 6 + .../docker-compose.yml | 19 +++ .../nginx_server.conf | 35 ++++ services/jean-cloud.net/deploy.sh | 3 + services/jean-cloud.net/install.sh | 14 -- services/jean-cloud.net/nginx_server.conf | 2 +- .../lexicographe.jean-cloud.net/deploy.sh | 4 + .../lexicographe.jean-cloud.net/install.sh | 16 -- services/list_ips.sh | 2 +- services/pa1.studios.oma-radio.fr/wg-pa1.sh | 2 - .../radiodemo.oma-radio.fr/docker-compose.yml | 1 - .../radiodemo.oma-radio.fr/nginx_server.conf | 1 + .../radiodemo.oma-radio.fr/wg-radiodemo.sh | 7 +- 39 files changed, 516 insertions(+), 257 deletions(-) create mode 100755 provisioning/roles/deploy_all/files/bin/deploy_service.sh create mode 100755 provisioning/roles/deploy_all/files/bin/gen_env.sh create mode 100755 provisioning/roles/deploy_all/files/bin/git_update.sh create mode 100644 provisioning/roles/deploy_all/files/bin/hugo_rclone.sh create mode 100755 provisioning/roles/deploy_all/files/bin/jcservice.sh create mode 100755 provisioning/roles/deploy_all/files/bin/restart_nginx.sh delete mode 100644 provisioning/roles/deploy_all/files/bind/db.lalis.fr create mode 100644 services/deployer.jean-cloud.org/deploy.sh rename services/deployer.jean-cloud.org/{nginx.conf => nginx_server.conf} (58%) create mode 100755 services/deployer.jean-cloud.org/server.sh create mode 100755 services/etrevivant.net/deploy_http.sh delete mode 100755 services/etrevivant.net/install.sh create mode 100644 services/grapes.chahut.jean-cloud.net/.env create mode 100755 services/grapes.chahut.jean-cloud.net/deploy.sh create mode 100755 services/grapes.chahut.jean-cloud.net/docker-compose.yml create mode 100755 services/grapes.chahut.jean-cloud.net/nginx_server.conf create mode 100755 services/jean-cloud.net/deploy.sh delete mode 100755 services/jean-cloud.net/install.sh create mode 100755 services/lexicographe.jean-cloud.net/deploy.sh delete mode 100755 services/lexicographe.jean-cloud.net/install.sh delete mode 100644 services/radiodemo.oma-radio.fr/docker-compose.yml diff --git a/installing/debootstrap_ordis_portables.sh b/installing/debootstrap_ordis_portables.sh index a5dd8a5..aa29e15 100755 --- a/installing/debootstrap_ordis_portables.sh +++ b/installing/debootstrap_ordis_portables.sh @@ -74,6 +74,9 @@ usage[I]="Interractive mode. Ask questions if needed." varia[I]=interractive interractive=false +usage[D]="Data Device. Will be encrypted." +varia[D]=data_device +data_device= . driglibash-args @@ -181,7 +184,7 @@ echo "$repos" >> "$mnt/etc/apt/sources.list" run chroot "$mnt" < "$mnt/etc/locale.gen" chroot_run locale-gen +if [ -n "$data_device" ] ; then + section "Mounting data dir" + cryptsetup create --type plain dmcrypt-jeancloud "$data_device" +fi + section "Configuring new system" uuid=$(blkid | grep "$root_device" | cut -d ' ' -f 2) @@ -201,10 +209,12 @@ line_in_file "proc /proc proc defaults" "$mnt/etc/fstab" # Set hostname run echo "$hostname" > "$mnt/etc/hostname" +# Prenvent suspend on lid close +line_in_file HandleLidSwitch=ignore /etc/systemd/logind.conf + # Fix path and remove noisy beep run cat > "$mnt/root/.bashrc" <> "$mnt/etc/inputrc" @@ -253,7 +263,7 @@ if [ -n "$(ls -A $secret_dir)" ]; then #die "Secret dir '$secret_dir' is not empty" yell "Secret dir is not empty. May erase key." fi -run export HOSTNAME="$hostname" && ssh-keygen -b 4096 -f "$secret_dir/id_rsa" -P '' +run export HOSTNAME="$hostname" && ssh-keygen -b 4096 -f "$secret_dir/id_rsa" -P '' -C "access@$hostname" run mkdir -p "$mnt/root/.ssh/" cat "$secret_dir/id_rsa.pub" >> "$mnt/root/.ssh/authorized_keys" chroot_run systemctl enable ssh diff --git a/provisioning/roles/deploy_all/files/bin/deploy_service.sh b/provisioning/roles/deploy_all/files/bin/deploy_service.sh new file mode 100755 index 0000000..4bc0e29 --- /dev/null +++ b/provisioning/roles/deploy_all/files/bin/deploy_service.sh @@ -0,0 +1,156 @@ +#!/bin/bash +. driglibash-base +. /etc/jeancloud.env + +set -euo pipefail + +noreload=false +deploy=true +if [ "$#" -ge 2 ] && [ "$2" = noreload ] ; then + noreload=true +elif [ "$#" -ge 3 ] && [ "$3" = undeploy ] ; then + deploy=false +else + die "Usage: $0 [no]reload [un]deploy" +fi + + +if [ -d "/docker/$1" ] ; then + service="$1" +elif [ -d "$1" ] && [[ "$service" = /docker/* ]] ; then + service="$(basename "$1")" +else + die "/docker/$service not found" +fi + +if [ ! -d "$new_nginx_conf_path" ] ; then + die "Can’t deploy service in degraded state. $new_nginx_conf_path dir is missing, please run deployer.sh first" +fi + + +docker_service="$(echo "$service" | tr '.' '_')" +driglibash_section_prefix="[$service] " + +cd "/docker/$service" +[ -f .env ] && . .env + + +############################################################################### +# Useful directories +############################################################################### + +if "$deploy" ; then + mkdir -p "$DATA_DIR" "$HTTP_DIR" + # Try running podman as non-root first… + chown www-data:www-data -R "$HTTP_DIR" +else + [ -d "$HTTP_DIR" ] && rm -r "$HTTP_DIR" +fi + + +############################################################################### +# Run scripts +############################################################################### + +if "$deploy" ; then + [ -x deploy.sh ] && ./deploy.sh + [ -x deploy_http.sh ] && sudo -u www-data ./deploy_http.sh +else + [ -x undeploy.sh ] && ./undeploy.sh +fi + + +############################################################################### +# Docker containers +############################################################################### + +# If there is a docker-compose file and it has services in it +if [ -f "/docker/$service/docker-compose.yml" ] && [ -n "$(grep '^[^#]*services' "/docker/$service/docker-compose.yml")" ] ; then + section "-------------------- $service" + if $deploy ; then + section "Logging to registry" + # XXX Login to docker registry + + section "Pulling images" + run docker-compose pull + + section "Starting service" + run docker-compose up -d --remove-orphans + else + section "Removing containers" + docker-compose down --rmi all --remove-orphans + fi +fi + +if ! "$deploy" ; then + section "Remove stray containers" + while read container ; do + echo "Removing $container" + run docker rm "$container" + done <<< "$(docker ps | grep "$docker_service" | cut -d ' ' -f 1)" +fi + + + +############################################################################### +# wireguard interface +############################################################################### + +# If there is a wireguard vpn script +for file in $( find "/docker/$service" -name "wg-*.sh") ; do + section "Managing wg interface $(basename "$file")" + if [ -x "$file" ] ; then + wgif="$(basename "$file")" + wgif="${wgif:3:-3}" + "$file" $wgif > "/etc/wireguard/$wgif.conf" + if "$deploy" ; then + systemctl enable "wg-quick@$wgif" + startwg.sh "$wgif" + else + if [ -z "$(ip a | grep "$wgif")" ] ; then + wg-quick down "$wgif" + fi + fi + fi +done + + +############################################################################### +# Nginx conf +############################################################################### + +# If there is a nginx conf file +if [ -f "/docker/$service/nginx_server.conf" ] ; then + section "Copy nginx conf" + run cp "/docker/$service/nginx_server.conf" "$new_nginx_conf_path/$service" + + section "Template nginx conf with vars from '.env' file" + run template.sh "/docker/$service/.env" < "/docker/$service/nginx_server.conf" > "$new_nginx_conf_path/$service" +fi + +# Do we need dummy cert? +if [ ! -e "$certs_path/$service/fullchain.pem" ] ; then + section "Create cert dir" + run mkdir -p "$certs_path/$service" + + section "Link dummy to cert" + run ln -s "$dummy_cert_path/fullchain.pem" "$certs_path/$service" + run ln -s "$dummy_cert_path/privkey.pem" "$certs_path/$service" +fi + +section "Testing nginx conf" +run nginx -t -c /etc/nginx/new_nginx.conf + +if [ "$noreload" == false ] ; then + restart_nginx.sh +fi + +section "Cleaning" +if [ -z "$(ls -A "$DATA_DIR")" ] ; then + run rmdir "$DATA_DIR" +fi +if [ -z "$(ls -A "$HTTP_DIR")" ] ; then + run rmdir "$HTTP_DIR" +fi + + diff --git a/provisioning/roles/deploy_all/files/bin/deployer.sh b/provisioning/roles/deploy_all/files/bin/deployer.sh index 0d6e11e..d2577ab 100755 --- a/provisioning/roles/deploy_all/files/bin/deployer.sh +++ b/provisioning/roles/deploy_all/files/bin/deployer.sh @@ -4,51 +4,29 @@ driglibash_run_retry=true . driglibash-base set -euo pipefail +run gen_env.sh + ############################################################################### # Variables ############################################################################### -proxy_dir="/etc/nginx" -nginx_conf_path="$proxy_dir/sites-enabled" -new_nginx_conf_path="$proxy_dir/new-sites-enabled" +export proxy_dir="/etc/nginx" +export nginx_conf_path="$proxy_dir/sites-enabled" +export new_nginx_conf_path="$proxy_dir/new-sites-enabled" -certs_path="/etc/letsencrypt/live" -dummy_cert_path="$certs_path/dummy" +export certs_path="/etc/letsencrypt/live" +export dummy_cert_path="$certs_path/dummy" ############################################################################### # Helpers ############################################################################### -# Returns the public IP4 address of a domain name -function ipof { - resolv.sh "$1" -} - -function jcservice { - if [ "$#" -ne 2 ] ; then - echo "usage: $0 " - echo "action is start/stop/reload/restart" - echo "service is a jc service name" - exit 1 - fi - action="$1" - service="$2" - if [ -f "/docker/$service/install.sh" ] ; then - section "Running install script" - . "/docker/$service/install.sh" - # Is $action a bash function? - if [ -n "$(LC_ALL=C type "$action" | head -n 1 | grep 'function')" ] ; then - "$action" - fi - unset -f start stop reload restart "$action" - fi -} - # Path to this directory here="$(where 'follow_links')" # Ip4 address -my_ip="$(ipof "$(cat /etc/hostname)")" +#my_ip="$(resolv.sh "$(cat /etc/hostname)")" +my_ip="$(curl -4 ifconfig.me 2>/dev/null)" [ -z "$my_ip" ] && yell "Unable to find my IP" && exit 1 @@ -57,7 +35,7 @@ my_ip="$(ipof "$(cat /etc/hostname)")" ############################################################################### driglibash_section_prefix="[Prepare nginx] " -section "Delete new conf directory (to recover)" +section "Delete new conf directory (to start from scratch)" run rm -rf "$new_nginx_conf_path" section "Create new conf file (for tests purposes)" @@ -85,121 +63,22 @@ run mkdir -p "$new_nginx_conf_path" # Deploy services ############################################################################### +section "Start docker" +run systemctl start docker docker.socket + +section "Deploy mandatory services" +deploy_service.sh deployer.jean-cloud.org noreload + for dir in /docker/* ; do service="$(basename "$dir")" # Ignore _ prefixed directories [ "${service::1}" == '_' ] && continue [ ! -d "$dir" ] && continue - - docker_service="$(echo "$service" | tr '.' '_')" - driglibash_section_prefix="[$service] " - export DATA_DIR="/data/$service" - export HTTP_DIR="/srv/http/$service" - export JC_SERVICE="$service" - line_in_file "HTTP_DIR='$HTTP_DIR'" "/docker/$service/.env" - line_in_file "DATA_DIR='$DATA_DIR'" "/docker/$service/.env" - line_in_file "JC_SERVICE='$JC_SERVICE'" "/docker/$service/.env" - - cd "/docker/$service" - - # Is service meant to be on this server? - ip="$(ipof "$service")" - [ -z "$ip" ] && echo "No ip found for $service" - - if [[ "$ip" != *"$my_ip"* ]] ; then - if [ -n "$(docker ps | grep "$docker_service")" ] ; then - section "--------------------" - section "Removing service" - docker-compose down --rmi all --remove-orphans - [ -d "$HTTP_DIR" ] && rm -r "$HTTP_DIR" - fi - - jcservice stop "$service" - - # TODO check for leftover wg interfaces - continue - fi - - mkdir -p "$DATA_DIR" "$HTTP_DIR" - - - # If there is a docker-compose file and it has services in it - if [ -f "/docker/$service/docker-compose.yml" ] && [ -n "$(grep '^[^#]*services' "/docker/$service/docker-compose.yml")" ] ; then - section "-------------------- $service" - - section "Logging to registry" - # XXX Login to docker registry - - section "Pulling images" - run docker-compose pull - - section "Starting service" - run docker-compose up -d --remove-orphans - fi - - jcservice start "$service" - - - # If there is a wireguard vpn script - for file in "/docker/$service/"wg-*.sh ; do - section "Starting wg interface" - if [ -x "$file" ] ; then - wgif="$(basename "$file")" - wgif="${wgif:3:-3}" - "$file" $wgif > "/etc/wireguard/$wgif.conf" - systemctl enable "wg-quick@$wgif" - startwg.sh $wgif - fi - done - - - # If there is a nginx conf file - if [ -f "/docker/$service/nginx_server.conf" ] ; then - section "Copy nginx conf" - run cp "/docker/$service/nginx_server.conf" "$new_nginx_conf_path/$service" - - section "Template nginx conf with vars from '.env' file" - run template.sh "/docker/$service/.env" < "/docker/$service/nginx_server.conf" > "$new_nginx_conf_path/$service" - fi - - # Do we need dummy cert? - if [ ! -e "$certs_path/$service/fullchain.pem" ] ; then - section "Create cert dir" - run mkdir -p "$certs_path/$service" - - section "Link dummy to cert" - run ln -s "$dummy_cert_path/fullchain.pem" "$certs_path/$service" - run ln -s "$dummy_cert_path/privkey.pem" "$certs_path/$service" - fi - - section "Testing nginx conf" - run nginx -t -c /etc/nginx/new_nginx.conf + [[ "$(resolv.sh $service)" != *$my_ip* ]] && continue + deploy_service.sh "$service" "noreload" done -############################################################################### -# Nginx restart -############################################################################### - -driglibash_section_prefix="[Restart nginx] " - -section "Test if nginx conf is ok" -run nginx -t -c "$proxy_dir/new_nginx.conf" - -section "Update nginx conf" -run rm -rf "$nginx_conf_path" -run mv "$new_nginx_conf_path" "$nginx_conf_path" -run cp "/docker/_proxy/nginx.conf" "$proxy_dir/nginx.conf" - -section "Test nginx conf to be sure" -run nginx -t - -if [ -z "$(cat /var/run/nginx.pid)" ] ; then - section "Start nginx" - run nginx -else - section "Reload nginx" - run nginx -s reload -fi +restart_nginx.sh clean diff --git a/provisioning/roles/deploy_all/files/bin/driglibash-base b/provisioning/roles/deploy_all/files/bin/driglibash-base index d9bb9ea..5f7d430 100755 --- a/provisioning/roles/deploy_all/files/bin/driglibash-base +++ b/provisioning/roles/deploy_all/files/bin/driglibash-base @@ -48,11 +48,11 @@ section(){ fi repeat '=' "$left" + echo -ne " $text " if [ "$right" -ge 1 ] ; then - echo -ne " $text " repeat '=' "$right" - echo fi + echo if "$driglibash_step_by_step" ; then echo "Press enter to proceed" diff --git a/provisioning/roles/deploy_all/files/bin/gen_env.sh b/provisioning/roles/deploy_all/files/bin/gen_env.sh new file mode 100755 index 0000000..24c4db2 --- /dev/null +++ b/provisioning/roles/deploy_all/files/bin/gen_env.sh @@ -0,0 +1,28 @@ +#!/bin/bash +set -euo pipefail + +. driglibash-base + +JC_ENV=/etc/jeancloud.env + +certs_path=/etc/letsencrypt/live +proxy_dir=/etc/nginx + +cat > "$JC_ENV" < " + echo "action is start/stop/reload/restart" + echo "service is a jc service name" + exit 1 +fi +action="$1" +service="$2" +if [ -f "/docker/$service/install.sh" ] ; then + section "Running install script" + . "/docker/$service/install.sh" + # Is $action a bash function? + if [ -n "$(LC_ALL=C type "$action" | head -n 1 | grep 'function')" ] ; then + (source "/docker/$service/.env" && "$action") + else + die "$0 no action $action found for service $service" + fi +fi diff --git a/provisioning/roles/deploy_all/files/bin/restart_nginx.sh b/provisioning/roles/deploy_all/files/bin/restart_nginx.sh new file mode 100755 index 0000000..843581d --- /dev/null +++ b/provisioning/roles/deploy_all/files/bin/restart_nginx.sh @@ -0,0 +1,24 @@ +#!/bin/bash +. driglibash-base +. /etc/jeancloud.env + +driglibash_section_prefix="[Restart nginx] " + +section "Test if nginx conf is ok" +run nginx -t -c "$proxy_dir/new_nginx.conf" + +section "Update nginx conf" +run rm -rf "$nginx_conf_path" +run cp -r "$new_nginx_conf_path" "$nginx_conf_path" +run cp "/docker/_proxy/nginx.conf" "$proxy_dir/nginx.conf" + +section "Test nginx conf to be sure" +run nginx -t + +if [ -z "$(cat /var/run/nginx.pid)" ] ; then + section "Start nginx" + run nginx +else + section "Reload nginx" + run nginx -s reload +fi diff --git a/provisioning/roles/deploy_all/files/bind/db.etrevivant.net b/provisioning/roles/deploy_all/files/bind/db.etrevivant.net index b33a5cb..c991d10 100644 --- a/provisioning/roles/deploy_all/files/bind/db.etrevivant.net +++ b/provisioning/roles/deploy_all/files/bind/db.etrevivant.net @@ -1,6 +1,6 @@ $TTL 604800 -@ IN SOA max.jean-cloud.org. contact.jean-cloud.org. ( - 2023062300 ; Serial +@ IN SOA tetede.jean-cloud.org. contact.jean-cloud.org. ( + 2023082700 ; Serial 7200 ; Refresh 7200 ; Retry 2419200 ; Expire @@ -23,6 +23,8 @@ _dmarc 86400 IN TXT v=DMARC1; p=quarantine; ; web -@ IN A 51.255.33.248 -@ IN A 82.65.204.254 +@ IN A 51.195.40.128 +@ IN A 109.18.84.200 +www IN A 51.195.40.128 +www IN A 109.18.84.200 diff --git a/provisioning/roles/deploy_all/files/bind/db.jean-cloud.net b/provisioning/roles/deploy_all/files/bind/db.jean-cloud.net index 81407b9..29cbd4a 100644 --- a/provisioning/roles/deploy_all/files/bind/db.jean-cloud.net +++ b/provisioning/roles/deploy_all/files/bind/db.jean-cloud.net @@ -1,13 +1,13 @@ $TTL 604800 -@ IN SOA max.jean-cloud.org. contact.jean-cloud.org. ( - 2023061500 ; Serial +@ IN SOA tetede.jean-cloud.org. contact.jean-cloud.org. ( + 2023082700 ; Serial 7200 ; Refresh 7200 ; Retry 2419200 ; Expire 7200 ) ; Negative Cache TTL ; NS -@ IN NS max.jean-cloud.org. +;@ IN NS max.jean-cloud.org. @ IN NS tetede.jean-cloud.org. @ IN NS ns1.he.net. @ IN NS ns2.he.net. @@ -16,7 +16,7 @@ $TTL 604800 @ IN NS ns5.he.net. @ IN A 51.255.33.248 -@ IN A 82.65.204.254 +@ IN A 109.18.84.200 @ 10800 IN MX 10 spool.mail.gandi.net. @@ -26,7 +26,7 @@ $TTL 604800 ; Resolving nameserver ns2 IN A 51.255.33.248 -ns1 IN A 82.65.204.254 +;ns1 IN A 82.65.204.254 ;mail IN CNAME vandamme webmail IN CNAME vandamme @@ -49,8 +49,8 @@ tetede IN A 51.195.40.128 heart IN A 109.18.84.200 -max IN A 82.65.204.254 -max IN AAAA 2a01:e0a:c9d:81d0:a2b3:ccff:fe85:af97 +;max IN A 82.65.204.254 +;max IN AAAA 2a01:e0a:c9d:81d0:a2b3:ccff:fe85:af97 montbonnot IN A 188.114.97.2 montbonnot IN A 188.114.96.2 @@ -129,17 +129,18 @@ tracker IN CNAME tetede.jean-cloud.org. raplacgr IN CNAME tetede.jean-cloud.org. -walou IN CNAME dumbcluster.jean-cloud.org. - nc-backup IN CNAME blatte.jean-cloud.org. gypsy IN CNAME tetede.jean-cloud.org. shlago.wireguard.jean-cloud.net IN CNAME tetede.jean-cloud.org. -lexicographe IN CNAME max.jean-cloud.org. +lexicographe IN CNAME tetede.jean-cloud.org. chahut IN CNAME max.jean-cloud.org. www.chahut IN CNAME max.jean-cloud.org. wordpress.chahut IN CNAME max.jean-cloud.org. www.wordpress.chahut IN CNAME max.jean-cloud.org. +grapes.chahut IN CNAME max.jean-cloud.org. + +louixel IN CNAME raku.jean-cloud.org. diff --git a/provisioning/roles/deploy_all/files/bind/db.jean-cloud.org b/provisioning/roles/deploy_all/files/bind/db.jean-cloud.org index 96848ba..fe5a744 100644 --- a/provisioning/roles/deploy_all/files/bind/db.jean-cloud.org +++ b/provisioning/roles/deploy_all/files/bind/db.jean-cloud.org @@ -1,6 +1,6 @@ $TTL 604800 -@ IN SOA max.jean-cloud.org. contact.jean-cloud.org. ( - 2023061500 ; Serial +@ IN SOA tetede.jean-cloud.org. contact.jean-cloud.org. ( + 2023082700 ; Serial 604800 ; Refresh 86400 ; Retry 2419200 ; Expire @@ -9,12 +9,12 @@ $TTL 604800 @ IN NS max @ IN NS tetede +@ IN A 109.18.84.200 @ IN A 51.255.33.248 -@ IN A 82.65.204.254 ; NS ;ns1 IN CNAME vandamme -ns2 IN A 82.65.204.254 +;ns2 IN A 82.65.204.254 ns3 IN A 51.195.40.128 ; Mails @@ -46,8 +46,8 @@ tetede IN AAAA 2001:41d0:701:1100::31f heart IN A 109.18.84.200 -max IN A 82.65.204.254 -max IN AAAA 2a01:e0a:c9d:81d0:a2b3:ccff:fe85:af97 +max IN A 109.18.84.200 +;max IN AAAA 2a01:e0a:c9d:81d0:a2b3:ccff:fe85:af97 montbonnot IN A 188.114.97.2 montbonnot IN A 188.114.96.2 @@ -55,3 +55,7 @@ montbonnot IN AAAA 2a06:98c1:3120::2 montbonnot IN AAAA 2a06:98c1:3121::2 blatte IN A 10.98.1.2 + + +;raku IN A 37.65.25.194 +raku IN AAAA 2a02:842a:39a:4d01:b283:feff:fe4c:5dee diff --git a/provisioning/roles/deploy_all/files/bind/db.karnaval.fr b/provisioning/roles/deploy_all/files/bind/db.karnaval.fr index 75a6cf9..4bab8d0 100644 --- a/provisioning/roles/deploy_all/files/bind/db.karnaval.fr +++ b/provisioning/roles/deploy_all/files/bind/db.karnaval.fr @@ -15,7 +15,7 @@ $TTL 604800 @ IN NS ns4.he.net. @ IN NS ns5.he.net. -@ IN A 82.65.204.254 +@ IN A 213.186.33.40 ;@ IN AAAA 2001:41d0:701:1100::31f @@ -23,6 +23,6 @@ $TTL 604800 ns1 IN A 51.255.33.248 ns2 IN A 172.104.154.21 -benevoles IN CNAME max.jean-cloud.org. -benevoles31 IN CNAME max.jean-cloud.org. +;benevoles IN CNAME max.jean-cloud.org. +;benevoles31 IN CNAME max.jean-cloud.org. diff --git a/provisioning/roles/deploy_all/files/bind/db.lalis.fr b/provisioning/roles/deploy_all/files/bind/db.lalis.fr deleted file mode 100644 index 35317e7..0000000 --- a/provisioning/roles/deploy_all/files/bind/db.lalis.fr +++ /dev/null @@ -1,15 +0,0 @@ -$TTL 604800 -@ IN SOA ns1.jean-cloud.net. contact.jean-cloud.org. ( - 2023042100 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 7200 ) ; Negative Cache TTL (min before refresh) - -@ IN NS ns1.jean-cloud.net. -@ IN NS ns2.he.net. -@ IN NS ns3.he.net. -@ IN NS ns4.he.net. -@ IN NS ns5.he.net. - -@ IN A 51.255.33.248 diff --git a/provisioning/roles/deploy_all/files/bind/db.oma-radio.fr b/provisioning/roles/deploy_all/files/bind/db.oma-radio.fr index 23fcb7a..205422d 100644 --- a/provisioning/roles/deploy_all/files/bind/db.oma-radio.fr +++ b/provisioning/roles/deploy_all/files/bind/db.oma-radio.fr @@ -1,6 +1,6 @@ $TTL 604800 -@ IN SOA max.jean-cloud.org. contact.jean-cloud.org. ( - 2023060100 ; Serial +@ IN SOA tetede.jean-cloud.org. contact.jean-cloud.org. ( + 2023082700 ; Serial 604800 ; Refresh 7200 ; Retry 2419200 ; Expire @@ -8,7 +8,7 @@ $TTL 604800 ; NS -@ IN NS max.jean-cloud.org. +;@ IN NS max.jean-cloud.org. @ IN NS tetede.jean-cloud.org. diff --git a/provisioning/roles/deploy_all/files/bind/named.conf.local b/provisioning/roles/deploy_all/files/bind/named.conf.local index 70453a8..0e21805 100644 --- a/provisioning/roles/deploy_all/files/bind/named.conf.local +++ b/provisioning/roles/deploy_all/files/bind/named.conf.local @@ -58,11 +58,6 @@ zone "inurbe.fr"{ type master; file "/etc/bind/db.inurbe.fr"; }; -zone "lalis.fr"{ - allow-update { none; }; # We are primary DNS - type master; - file "/etc/bind/db.lalis.fr"; -}; zone "leida.fr"{ allow-update { none; }; # We are primary DNS type master; diff --git a/provisioning/roles/deploy_all/tasks/main.yml b/provisioning/roles/deploy_all/tasks/main.yml index a72b27d..33911b6 100644 --- a/provisioning/roles/deploy_all/tasks/main.yml +++ b/provisioning/roles/deploy_all/tasks/main.yml @@ -8,11 +8,16 @@ archive: false recursive: true + - name: Add binaries ansible.posix.synchronize: src: "{{ role_path }}/files/bin/" dest: "/usr/local/bin" +- name: Gen env vars + command: gen_env.sh + + - name: Add bind conf ansible.posix.synchronize: src: "{{ role_path }}/files/bind/" diff --git a/provisioning/roles/jean-cloud-common/tasks/main.yml b/provisioning/roles/jean-cloud-common/tasks/main.yml index 5b92dc9..b99751e 100644 --- a/provisioning/roles/jean-cloud-common/tasks/main.yml +++ b/provisioning/roles/jean-cloud-common/tasks/main.yml @@ -29,7 +29,7 @@ - name: Install some softwares apt: - name: ['bind9', 'certbot', 'curl', 'dnsutils', 'git', 'gnupg2', 'htop', 'netcat-openbsd', 'nginx', 'rsync', 'screen', 'sshfs', 'sudo', 'traceroute', 'vim', 'wget', 'zip'] + name: ['bind9', 'certbot', 'curl', 'dnsutils', 'git', 'gnupg2', 'htop', 'hugo', 'netcat-openbsd', 'nginx', 'podman', 'rclone', 'rsync', 'screen', 'sshfs', 'sudo', 'traceroute', 'vim', 'wget', 'zip'] state: latest # TODO disable certbot and certbot.timer services. We are using our own @@ -40,6 +40,7 @@ state: directory with_items: - /docker + - /srv/http - /data - /etc/letsencrypt @@ -81,3 +82,12 @@ HISTTIMEFORMAT="%Y%m%d-%T " export HISTSIZE HISTFILESIZE HISTTIMEFORMAT + +- name : Disable docker service + service: + name: "{{ item }}" + state: stopped + enabled: false + with_items: + - docker + - docker.socket diff --git a/readme.md b/readme.md index acc1123..94b99d4 100644 --- a/readme.md +++ b/readme.md @@ -18,13 +18,16 @@ Le script deployer.sh va pour chaque service - Démarrer docker-compose si besoin - Copier le fichier nginx.conf dans sites-enabled si besoin (en remplaçant certaines variables) (en créant un faux certificat ssl si besoin) - Démarrer et activer une interface wg si un fichier `wg-*.conf` est présent. -- Exécuter le script install.sh du service s’il existe +- Exécuter le script deploy.sh du service s’il existe +- Exécuter le script deploy_http.sh en tant que www-data s’il existe. Ce script peut également être éxécuter par nginx pour mettre à jour le site web. Le script letsencrypt.sh va renouveler tous les certificats dont le serveur a besoin (il va lire dans /etc/nginx/sites-enabled). ## Variables Le script deployer.sh crée les variables - DATA_DIR : là où sauvegarder des données +- DOCKER_DIR : dossier contenant les fichiers de déploiement du service - HTTP_DIR : là où mettre les fichiers web si ils sont statiques. Ce dossier peut être détruit à tout moment, il n’est pas sauvegardé. - JC_SERVICE : le nom du dossier service. Correspond souvent à l’adresse du service. Ces variables sont ajoutées au ficher .env du service. (écrasées si existantes donc). + diff --git a/services/deployer.jean-cloud.org/deploy.sh b/services/deployer.jean-cloud.org/deploy.sh new file mode 100644 index 0000000..b910ecb --- /dev/null +++ b/services/deployer.jean-cloud.org/deploy.sh @@ -0,0 +1,2 @@ +#!/bin/bash +chmod +x server.sh diff --git a/services/deployer.jean-cloud.org/nginx.conf b/services/deployer.jean-cloud.org/nginx_server.conf similarity index 58% rename from services/deployer.jean-cloud.org/nginx.conf rename to services/deployer.jean-cloud.org/nginx_server.conf index 5ab23df..680ed5a 100644 --- a/services/deployer.jean-cloud.org/nginx.conf +++ b/services/deployer.jean-cloud.org/nginx_server.conf @@ -1,12 +1,15 @@ +limit_req_zone global zone=deployer_limit:100k rate=3r/m; + server { listen 443; listen [::]:443; server_name $SERVER_HOST; ssl_certificate /etc/letsencrypt/live/deployer.jean-cloud.org/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/deployer.jean-cloud.org/privkey.pem; - location /reload { - fastcgi_param SCRIPT_FILENAME /var/www/html/test.sh; + location / { + limit_req zone=deployer_limit; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME /docker/deployer.jean-cloud.org/server.sh; fastcgi_pass unix:/var/run/fcgiwrap.socket; } } - diff --git a/services/deployer.jean-cloud.org/server.sh b/services/deployer.jean-cloud.org/server.sh new file mode 100755 index 0000000..fb45b81 --- /dev/null +++ b/services/deployer.jean-cloud.org/server.sh @@ -0,0 +1,38 @@ +#!/bin/bash +echo "Content-type: text/html" +echo "" + +service="$(echo "$DOCUMENT_URI" | tr -d '/\;!&<>?#[]()"*')" +path="/docker/$service/deploy_http.sh" +. /etc/jeancloud.env + +echo 'Rechargement d’un site web' +echo '' +echo "

Rechargement d’un site web : $service

" +echo "

Résultat local

" +if [ -x "$path" ] ; then + echo "
"
+	"$path"
+	ret="$?"
+	echo "
" + if [ "$ret" -ne 0 ] ; then + echo '

Une erreur a été détectée. Contactez Jean-Cloud.

' + else + while read ip ; do + echo curl http://deployer.jean-cloud.org/ --resolve "*:80:$ip" + if [ "$?" -eq 0 ] ; then + echo "$ip ok" + else + echo "$ip ERREUR" + fi + done < <(getent hosts deployer.jean-cloud.org | cut -d ' ' -f 1 | grep -v "$my_ip") + fi + + echo '

Les informations précédentes peuvent vous être utiles (erreurs dans un document, fichier absent…). Prenez le temps de les lire pour avoir un site dont toutes les pages fonctionnent !

' +else + echo "

Échec. Contactez Jean-Cloud

" +fi + +echo '' +echo ' + diff --git a/services/etrevivant.net/.env b/services/etrevivant.net/.env index 7d98583..817b5e9 100644 --- a/services/etrevivant.net/.env +++ b/services/etrevivant.net/.env @@ -1 +1,2 @@ GIT_SOURCE_REPO="https://git.jean-cloud.net/adrian/etrevivant" +CLOUD_LOCAL_PATH=content diff --git a/services/etrevivant.net/deploy_http.sh b/services/etrevivant.net/deploy_http.sh new file mode 100755 index 0000000..6be3832 --- /dev/null +++ b/services/etrevivant.net/deploy_http.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -euo pipefail + +. /docker/etrevivant.net/.env +. /data/etrevivant.net/.env +webdav_url="$(echo "$NC_SHARE_LINK" | sed 's#/s/.*#/public.php/webdav/#')" +webdav_user="$(echo "$NC_SHARE_LINK" |sed 's#.*/s/##')" +webdav_pass="$(rclone obscure "$NC_SHARE_PASSWORD")" + +cd "$HTTP_DIR" +if [ -d .git ] ; then + git reset --hard origin/master + git pull --depth 1 --rebase +else + git clone --single-branch --depth 1 "$GIT_SOURCE_REPO" . +fi +rclone sync --webdav-url="$webdav_url" --webdav-user="$webdav_user" --webdav-pass="$webdav_pass" --webdav-vendor=nextcloud :webdav: content/ +hugo diff --git a/services/etrevivant.net/install.sh b/services/etrevivant.net/install.sh deleted file mode 100755 index 9c41c3a..0000000 --- a/services/etrevivant.net/install.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -euo pipefail - -start() { - . /docker/etrevivant.net/.env - . /data/etrevivant.net/.env - webdav_url="$(echo "$NC_SHARE_LINK" | sed 's#/s/.*#/public.php/webdav/#')" - webdav_user="$(echo "$NC_SHARE_LINK" |sed 's#.*/s/##')" - webdav_pass="$(rclone obscure "$NC_SHARE_PASSWORD")" - sudo -u www-data bash <