3 files changed, 201 insertions, 102 deletions

diff --git a/Makefile b/Makefile
index fe1c42b..5a8c27d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@ MANDIR ?= $(PREFIX)/share/man/man1
 
 install:
         @echo "Installing whiterabbit..."
-        install -Dm755 whiterabbit.sh $(BINDIR)/whiterabbit
-        install -Dm644 whiterabbit.1 $(MANDIR)/whiterabbit.1
-        @echo "Installed to $(BINDIR)/whiterabbit and man page to $(MANDIR)/whiterabbit.1"
+        install -Dm755 wh.sh $(BINDIR)/wh
+        install -Dm644 wh.1 $(MANDIR)/wh.1
+        @echo "Installed to $(BINDIR)/whand man page to $(MANDIR)/wh.1"
 
 uninstall:
-        @echo "Removing whiterabbit..."
-        rm -f $(BINDIR)/whiterabbit
-        rm -f $(MANDIR)/whiterabbit.1
-        @echo "Removed whiterabbit and its man page"
+        @echo "Removing wh..."
+        rm -f $(BINDIR)/wh
+        rm -f $(MANDIR)/wh.1
+        @echo "Removed wh and its man page"
diff --git a/whiterabbit.1 b/wh.1
index e02030f..8a6230f 100644
--- a/whiterabbit.1
+++ b/wh.1
@@ -4,25 +4,26 @@
 whiterabbit \- auto-configure Matrix homeservers (Dendrite or Synapse)
 .SH SYNOPSIS
 .B whiterabbit
-[\fIturn\fR|\fIdendrite\fR|\fIsynapse\fR|\fIlist\fR|\fIremove <domain>\fR]
+[\fIturn\fR|\fIdendrite\fR|\fIsynapse\fR|\fIlist\fR|\fIremove <domain>\fR|
+\fI-t\fR|\fI-d\fR|\fI-s\fR|\fI-l\fR|\fI-r <domain>\fR]
 .SH DESCRIPTION
 whiterabbit sets up Matrix homeservers with a global Coturn server and Nginx/Let's Encrypt support.
 
-Main commands:
+Main commands and their short flag equivalents:
 .TP
-.B turn
+.B turn, -t
 Install or configure the global Coturn server.
 .TP
-.B dendrite
+.B dendrite, -d
 Add a new Matrix Dendrite server.
 .TP
-.B synapse
+.B synapse, -s
 Add a new Matrix Synapse server.
 .TP
-.B list
+.B list, -l
 List all configured Matrix servers.
 .TP
-.B remove <domain>
+.B remove <domain>, -r <domain>
 Remove a Matrix server by domain.
 
 .SH EXAMPLES
@@ -30,17 +31,32 @@ Remove a Matrix server by domain.
 whiterabbit turn
 Set up the global Coturn server.
 .TP
+whiterabbit -t
+Same as above using flag.
+.TP
 whiterabbit dendrite
 Add a Dendrite server with TLS and Nginx.
 .TP
+whiterabbit -d
+Same as above using flag.
+.TP
 whiterabbit synapse
 Add a Synapse server with TLS and Nginx.
 .TP
+whiterabbit -s
+Same as above using flag.
+.TP
 whiterabbit list
 Show all servers.
 .TP
+whiterabbit -l
+Same as above using flag.
+.TP
 whiterabbit remove matrix.example.com
 Remove a server.
+.TP
+whiterabbit -r matrix.example.com
+Same as above using flag.
 
 .SH NOTES
 All Matrix servers share the same Coturn instance.
diff --git a/whiterabbit.sh b/wh.sh
index f8eb350..db1c12d 100755
--- a/whiterabbit.sh
+++ b/wh.sh
@@ -3,12 +3,10 @@ set -eu
 
 BASE_DIR="/opt/matrix"
 
-# Detect docker compose binary
-DOCKER_COMPOSE=$(command -v docker-compose || command -v "docker" compose || true)
-if [ -z "$DOCKER_COMPOSE" ]; then
+DOCKER_COMPOSE=$(command -v docker-compose || command -v docker compose) || {
     echo "[ERROR] docker-compose or docker compose not found" >&2
     exit 1
-fi
+}
 
 usage() {
     cat <<'EOF'
@@ -21,12 +19,6 @@ Main actions:
   synapse    Add a new Matrix server (Synapse)
   list       Show all configured Matrix servers
   remove     Remove a Matrix server by domain
-
-Notes:
-  • Coturn should be installed only once using 'turn'.
-  • All Matrix servers share the same Coturn (TURN domain/secret).
-  • TLS certificates are issued automatically using Let's Encrypt.
-  • Requirements: docker, docker-compose, nginx, certbot, coturn.
 EOF
     exit 1
 }
@@ -34,15 +26,26 @@ EOF
 require_nonempty() {
     VAR_NAME="$1"
     VAR_VALUE="$2"
-    if [ -z "$VAR_VALUE" ]; then
+    [ -n "$VAR_VALUE" ] || {
         echo "[ERROR] $VAR_NAME cannot be empty" >&2
         exit 1
-    fi
+    }
 }
 
 list_servers() {
     echo "=== Installed servers ==="
-    ls -1 "$BASE_DIR" 2>/dev/null || echo "No servers installed"
+    for dir in "$BASE_DIR"/*; do
+        [ -d "$dir" ] || continue
+        name=$(basename "$dir")
+
+        status=$(docker ps --filter "name=^${name}$" --format "{{.Status}}")
+        ports=$(docker ps --filter "name=^${name}$" --format "{{.Ports}}" | sed 's/, /\n   /g')
+
+        [ -n "$status" ] && {
+            echo "- $name [RUNNING] on:"
+            echo "   $ports"
+        } || echo "- $name [STOPPED]"
+    done
 }
 
 install_turn() {
@@ -83,11 +86,10 @@ EOF
     echo "$TURN_DOMAIN" > /etc/turn/domain
     echo "$TURN_SECRET" > /etc/turn/secret
 
-    if command -v systemctl >/dev/null; then
-        systemctl enable --now coturn || true
-    else
-        service coturn start || true
-    fi
+    case $(command -v systemctl >/dev/null && echo y || echo n) in
+        y) systemctl enable --now coturn || true ;;
+        n) service coturn start || true ;;
+    esac
 
     echo "[OK] Global Coturn configured ($TURN_DOMAIN)"
 }
@@ -100,23 +102,13 @@ common_prompts() {
     printf "Let's Encrypt certificate email: "
     read -r EMAIL
     require_nonempty EMAIL "$EMAIL"
-
-    printf "Postgres secret: "
-    read -r DB_PASS
-    require_nonempty DB_PASS "$DB_PASS"
-
-    printf "registration_shared_secret: "
-    read -r REG_SECRET
-    require_nonempty REG_SECRET "$REG_SECRET"
-
+    DB_PASS=$(tr -dc 'A-Za-z0-9' </dev/urandom | head -c 32)
+    REG_SECRET=$(tr -dc 'A-Za-z0-9' </dev/urandom | head -c 64)
     printf "MATRIX server IP (eg. 127.0.0.1): "
     read -r MATRIX_SERVER_IP
     require_nonempty MATRIX_SERVER_IP "$MATRIX_SERVER_IP"
-
     TURN_DOMAIN=$(cat /etc/turn/domain)
     TURN_SECRET=$(cat /etc/turn/secret)
-
-    # Generate unique port numbers from hash of domain
     HASH=$(printf "%s" "$MATRIX_DOMAIN" | cksum | cut -d ' ' -f1)
     PORT_BASE=$(( (HASH % 1000) + 8000 ))
     PORT_HTTP=$PORT_BASE
@@ -158,21 +150,19 @@ EOF
 
     ln -sf "/etc/nginx/sites-available/$DOMAIN" "/etc/nginx/sites-enabled/$DOMAIN"
     nginx -t || { echo "[ERROR] Invalid nginx config"; exit 1; }
-    if command -v systemctl >/dev/null; then
-        systemctl reload nginx
-    else
-        nginx -s reload
-    fi
-
-    if command -v certbot >/dev/null; then
-        certbot --nginx --non-interactive --agree-tos -m "$EMAIL" -d "$DOMAIN" || {
-            echo "[WARN] Certbot failed for $DOMAIN"
-        }
-    else
-        echo "[WARN] Certbot not installed, skipping TLS setup"
-    fi
-
-    echo "[OK] Nginx and SSL certificate configured for $DOMAIN"
+
+    
+    case $(command -v systemctl >/dev/null && echo y || echo n) in
+        y) systemctl reload nginx ;;
+        n) nginx -s reload ;;
+    esac
+
+    case $(command -v certbot >/dev/null && echo y || echo n) in
+    y) certbot --nginx --non-interactive --agree-tos -m "$EMAIL" -d "$DOMAIN" || {
+         echo "[WARN] Certbot failed for $DOMAIN"
+         } ;;
+     n) echo "[WARN] Certbot not installed, skipping TLS setup" ;;
+    esac
 }
 
 
@@ -201,6 +191,7 @@ cat <<EOF > compose.yml
 services:
   postgres:
     hostname: \${POSTGRES_HOSTNAME:-postgres}
+    container_name: ${MATRIX_DOMAIN}-db
     image: postgres:\${POSTGRES_VERSION:-15-alpine}
     restart: always
     volumes:
@@ -219,6 +210,7 @@ services:
 
   monolith:
     hostname: \${MONOLITH_HOSTNAME:-monolith}
+    container_name: ${MATRIX_DOMAIN}
     image: \${MONOLITH_IMAGE:-matrixdotorg/dendrite-monolith:latest}
     ports:
       - \${MONOLITH_PORT_HTTP:-8008}:8008
@@ -246,8 +238,6 @@ volumes:
   dendrite_search_index:
 EOF
 
-    # --- Plik konfiguracji Dendrite ---
-
 cat <<EOF > config/dendrite.yaml
 version: 2
 global:
@@ -318,23 +308,13 @@ dns_cache:
   cache_lifetime: "5m"
 EOF
 
-    # Generate necessary project directory
-    $DOCKER_COMPOSE up -d
-
-    $DOCKER_COMPOSE down
-
-    # --- Generowanie kluczy Dendrite + TLS jeśli nie istnieją ---
-        echo "[INFO] Generating Dendrite keys..."
+    echo "[INFO] Generating Dendrite keys..."
 
-docker run --rm --entrypoint=""   -v $(pwd):/mnt   matrixdotorg/dendrite-monolith:latest   /usr/bin/generate-keys   -private-key /mnt/matrix_key.pem   -tls-cert /mnt/server.crt   -tls-key /mnt/server.key
+    docker run --rm --entrypoint=""   -v $(pwd):/mnt   matrixdotorg/dendrite-monolith:latest   /usr/bin/generate-keys   -private-key /mnt/matrix_key.pem   -tls-cert /mnt/server.crt   -tls-key /mnt/server.key
         echo "[OK] Keys generated in $PWD"
 
-    # --- Start kontenerów ---
     $DOCKER_COMPOSE up -d
-
-    # --- Konfiguracja Nginx + SSL/TLS ---
     configure_nginx "$MATRIX_DOMAIN" "$PORT_HTTP"
-
     echo "[OK] Dendrite server ($MATRIX_DOMAIN) is running."
 }
 
@@ -345,73 +325,176 @@ install_synapse() {
     INSTALL_DIR="$BASE_DIR/$MATRIX_DOMAIN"
     mkdir -p "$INSTALL_DIR"
     cd "$INSTALL_DIR" || exit 1
+    mkdir -p data db
+    chown -R 991:991 data/
+    chown -R 999:999 db/
+    DB_USER="synapse"
+    DB_NAME="synapse"
+    DB_PASS=$(openssl rand -hex 16)
+    REG_SECRET=$(openssl rand -hex 32)
+
+    : "${PORT_HTTP:=8008}"
+    : "${PORT_HTTPS:=8448}"
+
+    cat <<EOF > .env
+# Matrix Synapse environment
+MATRIX_DOMAIN=$MATRIX_DOMAIN
+PORT_HTTP=$PORT_HTTP
+PORT_HTTPS=$PORT_HTTPS
+
+DB_USER=$DB_USER
+DB_NAME=$DB_NAME
+DB_PASS=$DB_PASS
+
+REG_SECRET=$REG_SECRET
+TURN_DOMAIN=$TURN_DOMAIN
+TURN_SECRET=$TURN_SECRET
+EOF
 
-    cat <<EOF > docker-compose.yml
-version: '3.4'
+
+cat <<EOF > compose.yml
 services:
   db:
     image: postgres:15-alpine
+    restart: always
     environment:
-      POSTGRES_USER: synapse
-      POSTGRES_PASSWORD: $DB_PASS
-      POSTGRES_DB: synapse
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASS}
+      POSTGRES_DB: ${DB_NAME}
+      LANG: C
+      LC_ALL: C
+    command: postgres -c lc_collate=C -c lc_ctype=C
     volumes:
       - ./db:/var/lib/postgresql/data
+    networks:
+      - synapse-net
 
   synapse:
     image: matrixdotorg/synapse:latest
-    depends_on: [ db ]
+    restart: always
+    depends_on:
+      - db
     environment:
-      SYNAPSE_SERVER_NAME: $MATRIX_DOMAIN
+      SYNAPSE_SERVER_NAME: ${MATRIX_DOMAIN}
       SYNAPSE_REPORT_STATS: "yes"
-      POSTGRES_PASSWORD: $DB_PASS
     ports:
-      - $PORT_HTTP:8008
-      - $PORT_HTTPS:8448
+      - "${PORT_HTTP}:8008"
+      - "${PORT_HTTPS}:8448"
     volumes:
       - ./data:/data
-EOF
+    networks:
+      - synapse-net
 
-    $DOCKER_COMPOSE up -d
+networks:
+  synapse-net:
+    driver: bridge
+EOF
 
-    cat <<EOF > data/homeserver-extra.yaml
-turn_uris: [ "turn:$TURN_DOMAIN?transport=udp", "turn:$TURN_DOMAIN?transport=tcp" ]
+$DOCKER_COMPOSE --env-file .env up -d
+docker run -it --rm -v ./data:/data -e SYNAPSE_SERVER_NAME=$MATRIX_DOMAIN -e SYNAPSE_REPORT_STATS=no matrixdotorg/synapse:latest generate
+
+echo "[INFO] Generating homeserver.yaml for Postgres + TURN..."
+cat <<EOF > data/homeserver.yaml
+server_name: $MATRIX_DOMAIN
+pid_file: /data/homeserver.pid
+
+listeners:
+  - port: $PORT_HTTP
+    tls: false
+    type: http
+    x_forwarded: true
+    resources:
+      - names: [client, federation]
+        compress: false
+
+database:
+  name: psycopg2
+  args:
+    user: $DB_USER
+    password: $DB_PASS
+    host: db
+    database: $DB_NAME
+    cp_min: 5
+    cp_max: 10
+
+enable_registration: false
+registration_shared_secret: "$REG_SECRET"
+
+turn_uris:
+  - turn:$TURN_DOMAIN?transport=udp
+  - turn:$TURN_DOMAIN?transport=tcp
 turn_shared_secret: "$TURN_SECRET"
 turn_user_lifetime: "5m"
+
+log_config: "/data/$MATRIX_DOMAIN.log.config"
+media_store_path: /data/media_store
+report_stats: false
+
+macaroon_secret_key: $REG_SECRET
+form_secret: $REG_SECRET
+signing_key_path: "/data/$MATRIX_DOMAIN.signing.key"
+
+trusted_key_servers:
+  - server_name: "matrix.org"
+suppress_key_server_warning: true
 EOF
 
-    configure_nginx "$MATRIX_DOMAIN" "$PORT_HTTP"
+    echo "[INFO] Restarting Synapse with full config..."
+    $DOCKER_COMPOSE --env-file .env restart synapse
+    $DOCKER_COMPOSE --env-file .env restart synapse
 
-    echo "[OK] Synapse server ($MATRIX_DOMAIN) is running."
+    configure_nginx "$MATRIX_DOMAIN" "$PORT_HTTP"
+    echo "[OK] Synapse server ($MATRIX_DOMAIN) is running with Postgres."
 }
 
+
 remove_server() {
-    DOMAIN="$1"
-    [ -z "$DOMAIN" ] && usage
+    [ "$#" -eq 0 ] && echo "Usage: remove_server <domain1> [domain2 ...]" && return 1
 
-    SERVER_DIR="$BASE_DIR/$DOMAIN"
-    case "$DOMAIN" in
-        ""|"/"|".") echo "[ERROR] Refusing to delete dangerous path ($DOMAIN)"; exit 1 ;;
-    esac
+    for DOMAIN in "$@"; do
+        SERVER_DIR="$BASE_DIR/$DOMAIN"
+
+        case "$DOMAIN" in
+            ""|"/"|".") 
+                echo "[ERROR] Refusing to delete dangerous path ($DOMAIN)"
+                continue
+                ;;
+        esac
+
+        [ -d "$SERVER_DIR" ] && \
+            echo "[INFO] Stopping and removing server: $DOMAIN" && \
+            (cd "$SERVER_DIR" && $DOCKER_COMPOSE down -v) || \
+            echo "[WARN] Failed to stop container for $DOMAIN"
 
-    if [ -d "$SERVER_DIR" ]; then
-        (cd "$SERVER_DIR" && $DOCKER_COMPOSE down -v) || true
         rm -rf "$SERVER_DIR"
-    fi
+        rm -f "/etc/nginx/sites-available/$DOMAIN" "/etc/nginx/sites-enabled/$DOMAIN"
+    done
 
-    rm -f "/etc/nginx/sites-available/$DOMAIN" "/etc/nginx/sites-enabled/$DOMAIN"
     nginx -t && (systemctl reload nginx 2>/dev/null || nginx -s reload)
-    echo "[OK] Server $DOMAIN removed."
+    echo "[OK] Done removing servers: $*"
 }
 
-# --- CLI router ---
 CMD="${1:-}"
 
 case "$CMD" in
+    -t) install_turn ;;
+    -d) install_dendrite ;;
+    -s) install_synapse ;;
+    -l) list_servers ;;
+    -r) 
+        [ -z "$2" ] && { echo "Usage: $0 -r <domain1> [domain2 ...]"; exit 1; }
+        shift
+        remove_server "$@"
+        ;;
     turn) install_turn ;;
     dendrite) install_dendrite ;;
     synapse) install_synapse ;;
     list) list_servers ;;
-    remove) remove_server "${2:-}" ;;
+    remove) 
+        [ -z "$2" ] && { echo "Usage: $0 remove <domain1> [domain2 ...]"; exit 1; }
+        shift
+        remove_server "$@"
+        ;;
     *) usage ;;
 esac
+