From 80ecf665305bc637e04099e28be02fe39c26daf2 Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 15:11:23 -0500 Subject: [PATCH 01/13] initial forgejo configuration --- playbook_templates/forgejo.actcur.com | 6 ++++++ var_files/certbot/forgejo.actcur.com | 7 +++++++ var_files/nginx-ssl/forgejo.actcur.com | 8 ++++++++ 3 files changed, 21 insertions(+) create mode 100644 playbook_templates/forgejo.actcur.com create mode 100644 var_files/certbot/forgejo.actcur.com create mode 100644 var_files/nginx-ssl/forgejo.actcur.com diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com new file mode 100644 index 0000000..8b07c5e --- /dev/null +++ b/playbook_templates/forgejo.actcur.com @@ -0,0 +1,6 @@ +role:core:v1.1:core +role:nginx-ssl:v1.0:common,nginx-ssl +role:certbot:v1.0:common,certbot +role:forgejo:v1.0:workload,forgejo + +# end of file diff --git a/var_files/certbot/forgejo.actcur.com b/var_files/certbot/forgejo.actcur.com new file mode 100644 index 0000000..a8e3e1e --- /dev/null +++ b/var_files/certbot/forgejo.actcur.com @@ -0,0 +1,7 @@ +--- +# vars file for certbot on forgejo.actcur.com + +domains: + - domain: forgejo.actcur.com + +# end of file \ No newline at end of file diff --git a/var_files/nginx-ssl/forgejo.actcur.com b/var_files/nginx-ssl/forgejo.actcur.com new file mode 100644 index 0000000..e305530 --- /dev/null +++ b/var_files/nginx-ssl/forgejo.actcur.com @@ -0,0 +1,8 @@ +--- +# vars file for nginx-ssl on forgejo.actcur.com + +domains: + - domain: forgejo.actcur.com + port: 8112 + +# end of file \ No newline at end of file -- 2.49.0 From 2e7ed3d3d40e623d0217efc0cd395d13a225aa3a Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 15:11:59 -0500 Subject: [PATCH 02/13] initial forgejo configuration --- playbook_templates/forgejo.actcur.com | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com index 8b07c5e..c1b3c58 100644 --- a/playbook_templates/forgejo.actcur.com +++ b/playbook_templates/forgejo.actcur.com @@ -1,6 +1,6 @@ role:core:v1.1:core role:nginx-ssl:v1.0:common,nginx-ssl role:certbot:v1.0:common,certbot -role:forgejo:v1.0:workload,forgejo +role:forgejo:testing:workload,forgejo # end of file -- 2.49.0 From 0811b0d30b8d7cb51efee5ab655483aedbd1a27e Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 17:04:17 -0500 Subject: [PATCH 03/13] update forgejo port --- var_files/nginx-ssl/forgejo.actcur.com | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var_files/nginx-ssl/forgejo.actcur.com b/var_files/nginx-ssl/forgejo.actcur.com index e305530..054b039 100644 --- a/var_files/nginx-ssl/forgejo.actcur.com +++ b/var_files/nginx-ssl/forgejo.actcur.com @@ -3,6 +3,6 @@ domains: - domain: forgejo.actcur.com - port: 8112 + port: 3000 # end of file \ No newline at end of file -- 2.49.0 From 04eee7783107513e309d6d7e8f0a24284b046e52 Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 18:34:43 -0500 Subject: [PATCH 04/13] added git domain and mount for data partition --- var_files/certbot/forgejo.actcur.com | 1 + var_files/mount/starrs.actcur copy.com | 17 +++++++++++++++++ var_files/nginx-ssl/forgejo.actcur.com | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 var_files/mount/starrs.actcur copy.com diff --git a/var_files/certbot/forgejo.actcur.com b/var_files/certbot/forgejo.actcur.com index a8e3e1e..b15b4a5 100644 --- a/var_files/certbot/forgejo.actcur.com +++ b/var_files/certbot/forgejo.actcur.com @@ -3,5 +3,6 @@ domains: - domain: forgejo.actcur.com + - domain: git.actcur.com # end of file \ No newline at end of file diff --git a/var_files/mount/starrs.actcur copy.com b/var_files/mount/starrs.actcur copy.com new file mode 100644 index 0000000..1b34bbe --- /dev/null +++ b/var_files/mount/starrs.actcur copy.com @@ -0,0 +1,17 @@ +--- +# vars file for mount on privtorrents.actcur.com + +mounts: + ext4: + - name: data + device: UUID=18ebdf3e-436c-4457-b3be-e946f29b78d4 + mount: /mnt/data + bind: + - name: forgejo data + src: /mnt/data/forgejo_data + mount: /var/lib/forgejo + - name: forgejo config + src: /mnt/data/forgejo_data + mount: /etc/forgejo_data + +# end of file diff --git a/var_files/nginx-ssl/forgejo.actcur.com b/var_files/nginx-ssl/forgejo.actcur.com index 054b039..dbbede1 100644 --- a/var_files/nginx-ssl/forgejo.actcur.com +++ b/var_files/nginx-ssl/forgejo.actcur.com @@ -4,5 +4,7 @@ domains: - domain: forgejo.actcur.com port: 3000 + - domain: git.actcur.com + port: 3000 # end of file \ No newline at end of file -- 2.49.0 From c08f961f977ad0cbc6145bbb90288e730cc42a76 Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 18:59:07 -0500 Subject: [PATCH 05/13] add mount and switch core to testing --- playbook_templates/forgejo.actcur.com | 3 ++- var_files/mount/{starrs.actcur copy.com => forgejo.actcur.com} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename var_files/mount/{starrs.actcur copy.com => forgejo.actcur.com} (100%) diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com index c1b3c58..13362db 100644 --- a/playbook_templates/forgejo.actcur.com +++ b/playbook_templates/forgejo.actcur.com @@ -1,5 +1,6 @@ -role:core:v1.1:core +role:core:fix:core role:nginx-ssl:v1.0:common,nginx-ssl +role:mount:v1.1:core,mount role:certbot:v1.0:common,certbot role:forgejo:testing:workload,forgejo diff --git a/var_files/mount/starrs.actcur copy.com b/var_files/mount/forgejo.actcur.com similarity index 100% rename from var_files/mount/starrs.actcur copy.com rename to var_files/mount/forgejo.actcur.com -- 2.49.0 From aed94e09e8ee4350721ad7bc07226479570a3d7a Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 19:18:09 -0500 Subject: [PATCH 06/13] fix forgejo config mount info --- var_files/mount/forgejo.actcur.com | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var_files/mount/forgejo.actcur.com b/var_files/mount/forgejo.actcur.com index 1b34bbe..df00b9e 100644 --- a/var_files/mount/forgejo.actcur.com +++ b/var_files/mount/forgejo.actcur.com @@ -11,7 +11,7 @@ mounts: src: /mnt/data/forgejo_data mount: /var/lib/forgejo - name: forgejo config - src: /mnt/data/forgejo_data - mount: /etc/forgejo_data + src: /mnt/data/forgejo_config + mount: /etc/forgejo # end of file -- 2.49.0 From b8e49734f9c0ff315b1d7131739ce224301994fa Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 21:21:21 -0500 Subject: [PATCH 07/13] moved forgejo to nginx-ssl testing branch --- playbook_templates/forgejo.actcur.com | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com index 13362db..e73873d 100644 --- a/playbook_templates/forgejo.actcur.com +++ b/playbook_templates/forgejo.actcur.com @@ -1,5 +1,5 @@ role:core:fix:core -role:nginx-ssl:v1.0:common,nginx-ssl +role:nginx-ssl:testing:common,nginx-ssl role:mount:v1.1:core,mount role:certbot:v1.0:common,certbot role:forgejo:testing:workload,forgejo -- 2.49.0 From f3f8b44039b989cff3fa92052093bf4c0130ff4a Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 21:48:03 -0500 Subject: [PATCH 08/13] test --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..e69de29 -- 2.49.0 From 16e79adf992b4703817410e7cf2c8a9a37945c6f Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 21:48:27 -0500 Subject: [PATCH 09/13] test --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index e69de29..0000000 -- 2.49.0 From 495b4764c817573416f632b2a183a260cae5207d Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 22:03:39 -0500 Subject: [PATCH 10/13] moved forgejo to production repo versions and moved all servers to latest core version --- playbook_templates/forgejo.actcur.com | 6 +++--- playbook_templates/privtorrents.actcur.com | 2 +- playbook_templates/starrs.actcur.com | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com index e73873d..25e0d7d 100644 --- a/playbook_templates/forgejo.actcur.com +++ b/playbook_templates/forgejo.actcur.com @@ -1,7 +1,7 @@ -role:core:fix:core -role:nginx-ssl:testing:common,nginx-ssl +role:core:v1.2:core +role:nginx-ssl:v1.0:common,nginx-ssl role:mount:v1.1:core,mount role:certbot:v1.0:common,certbot -role:forgejo:testing:workload,forgejo +role:forgejo:v1.0:workload,forgejo # end of file diff --git a/playbook_templates/privtorrents.actcur.com b/playbook_templates/privtorrents.actcur.com index 2eab318..2475e7e 100644 --- a/playbook_templates/privtorrents.actcur.com +++ b/playbook_templates/privtorrents.actcur.com @@ -1,4 +1,4 @@ -role:core:v1.1:core +role:core:v1.2:core role:mount:v1.1:core,mount role:deluge:v1.0:workload,deluge role:nginx-ssl:v1.0:common,nginx-ssl diff --git a/playbook_templates/starrs.actcur.com b/playbook_templates/starrs.actcur.com index 56b7f82..57f2abb 100644 --- a/playbook_templates/starrs.actcur.com +++ b/playbook_templates/starrs.actcur.com @@ -1,4 +1,4 @@ -role:core:v1.1:core +role:core:v1.2:core role:mount:v1.1:core,mount role:nginx-ssl:v1.0:common,nginx-ssl role:certbot:v1.0:common,certbot -- 2.49.0 From be05b970409ba07eef8e3152389af2c683ab49cf Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 22:06:58 -0500 Subject: [PATCH 11/13] moved nginx-ssl to remove-deny branch --- playbook_templates/forgejo.actcur.com | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com index 25e0d7d..8468c21 100644 --- a/playbook_templates/forgejo.actcur.com +++ b/playbook_templates/forgejo.actcur.com @@ -1,5 +1,5 @@ role:core:v1.2:core -role:nginx-ssl:v1.0:common,nginx-ssl +role:nginx-ssl:remove-deny:common,nginx-ssl role:mount:v1.1:core,mount role:certbot:v1.0:common,certbot role:forgejo:v1.0:workload,forgejo -- 2.49.0 From 77833ec271698db6d230c86396a2903a72c16242 Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 22:10:17 -0500 Subject: [PATCH 12/13] updated nginx tag --- playbook_templates/forgejo.actcur.com | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook_templates/forgejo.actcur.com b/playbook_templates/forgejo.actcur.com index 8468c21..0484e15 100644 --- a/playbook_templates/forgejo.actcur.com +++ b/playbook_templates/forgejo.actcur.com @@ -1,5 +1,5 @@ role:core:v1.2:core -role:nginx-ssl:remove-deny:common,nginx-ssl +role:nginx-ssl:v1.1:common,nginx-ssl role:mount:v1.1:core,mount role:certbot:v1.0:common,certbot role:forgejo:v1.0:workload,forgejo -- 2.49.0 From 7d00615d159923285ae251ff70ed8ecc2da4c174 Mon Sep 17 00:00:00 2001 From: Beth Date: Thu, 20 Mar 2025 22:10:32 -0500 Subject: [PATCH 13/13] updated nginx tag --- playbook_templates/privtorrents.actcur.com | 2 +- playbook_templates/starrs.actcur.com | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbook_templates/privtorrents.actcur.com b/playbook_templates/privtorrents.actcur.com index 2475e7e..e5fc350 100644 --- a/playbook_templates/privtorrents.actcur.com +++ b/playbook_templates/privtorrents.actcur.com @@ -1,7 +1,7 @@ role:core:v1.2:core role:mount:v1.1:core,mount role:deluge:v1.0:workload,deluge -role:nginx-ssl:v1.0:common,nginx-ssl +role:nginx-ssl:v1.1:common,nginx-ssl role:certbot:v1.0:common,certbot # end of file \ No newline at end of file diff --git a/playbook_templates/starrs.actcur.com b/playbook_templates/starrs.actcur.com index 57f2abb..f5263d6 100644 --- a/playbook_templates/starrs.actcur.com +++ b/playbook_templates/starrs.actcur.com @@ -1,6 +1,6 @@ role:core:v1.2:core role:mount:v1.1:core,mount -role:nginx-ssl:v1.0:common,nginx-ssl +role:nginx-ssl:v1.1:common,nginx-ssl role:certbot:v1.0:common,certbot role:sonarr:v1.0:workload,sonarr role:radarr:v1.0:workload,radarr -- 2.49.0