From 3c2f4a8b754d552cee13a337bbb2f8ce61e54915 Mon Sep 17 00:00:00 2001 From: Mafyuh Date: Mon, 16 Sep 2024 00:26:42 -0400 Subject: [PATCH 1/3] add nexterm --- docker/nexterm/docker-compose.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docker/nexterm/docker-compose.yml diff --git a/docker/nexterm/docker-compose.yml b/docker/nexterm/docker-compose.yml new file mode 100644 index 0000000..cf5d384 --- /dev/null +++ b/docker/nexterm/docker-compose.yml @@ -0,0 +1,11 @@ +services: + nexterm: + container_name: nexterm + ports: + - "6989:6989" + restart: always + volumes: + - nexterm:/app/data + image: germannewsmaker/nexterm:1.0.2-OPEN-PREVIEW +volumes: + nexterm: From e04c448475e0cbc5649c666ad367af6b3572cf3f Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 16 Sep 2024 21:32:24 -0400 Subject: [PATCH 2/3] add f2b to arm --- docker/arm/docker-compose.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 42b666c..8c8f424 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -65,6 +65,30 @@ services: restart: unless-stopped networks: - gitea_main + + fail2ban: + image: crazymax/fail2ban:1.1.0 + container_name: fail2ban + network_mode: "host" + cap_add: + - NET_ADMIN + - NET_RAW + volumes: + - "/docker/appdata/fail2ban/data:/data" + - "/var/log/auth.log:/var/log/auth.log:ro" + - "/docker/appdata/nginx/data/logs/:/log/npm/:ro" + environment: + - TZ=America/New_York + - F2B_LOG_TARGET=STDOUT + - F2B_LOG_LEVEL=INFO + - F2B_DB_PURGE_AGE=1d + - SSMTP_HOST=$SSMTP_HOST + - SSMTP_PORT=587 + - SSMTP_HOSTNAME=$SSMTP_HOSTNAME + - SSMTP_USER=$SSMTP_USER + - SSMTP_PASSWORD=$SSMTP_PASSWORD + - SSMTP_TLS=YES + restart: always uptime-kuma: image: louislam/uptime-kuma:1.23.13 From 60e3424fbc128f888f3e19314d1cf53ee778d895 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 16 Sep 2024 23:30:26 -0400 Subject: [PATCH 3/3] add cases for CD --- .forgejo/workflows/CD.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index 7bf27e1..56af015 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -33,6 +33,9 @@ jobs: IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}" for folder in "${folder_array[@]}"; do case $folder in + actual) + target_host="ubu.lan" + ;; arrs) target_host="arrs.lan" ;; @@ -60,11 +63,14 @@ jobs: netboot) target_host="netboot.lan" ;; - nexus) - target_host="nexus.lan" + nexterm) + target_host="ubu.lan" ;; - pages) - target_host="pages.lan" + npm) + target_host="npm.lan" + ;; + paperless) + target_host="ubu.lan" ;; portainer) target_host="port.lan"