From 65d07528e8bc8bc1735452d167072cb76d69cdbf Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 29 Nov 2024 10:21:06 +0100 Subject: [PATCH 1/4] Fix permissions and move xrootd specific config into separate block --- manifests/xrootd.pp | 2 ++ templates/xrootd/xrootd-manager.cfg.erb | 4 ++-- templates/xrootd/xrootd-server.cfg.erb | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/xrootd.pp b/manifests/xrootd.pp index 2b1d5f98..885eac8d 100644 --- a/manifests/xrootd.pp +++ b/manifests/xrootd.pp @@ -45,6 +45,8 @@ } file { '/opt/xrootd/config': ensure => directory, + owner => '100', + group => '101', } file { '/opt/xrootd/admin': ensure => directory, diff --git a/templates/xrootd/xrootd-manager.cfg.erb b/templates/xrootd/xrootd-manager.cfg.erb index 9219843e..1b404a4b 100644 --- a/templates/xrootd/xrootd-manager.cfg.erb +++ b/templates/xrootd/xrootd-manager.cfg.erb @@ -1,10 +1,10 @@ # Enable the HTTP protocol on port <%= @port %> (1094 is the default XRootD port) -xrd.protocol http:<%= @xrootd_port %> libXrdHttp.so if exec cmsd xrd.port <%= @cms_port %> fi if exec xrootd - xrd.port <%= @xrootd_port %> + xrd.protocol http:<%= @xrootd_port %> libXrdHttp.so + xrd.port <%= @xrootd_port %> fi # Upon last testing, the plugin did not yet work in async mode diff --git a/templates/xrootd/xrootd-server.cfg.erb b/templates/xrootd/xrootd-server.cfg.erb index 5d4f6eff..8827803f 100644 --- a/templates/xrootd/xrootd-server.cfg.erb +++ b/templates/xrootd/xrootd-server.cfg.erb @@ -1,10 +1,10 @@ # Enable the HTTP protocol on port <%= @port %> (1094 is the default XRootD port) -xrd.protocol http:<%= @xrootd_port %> libXrdHttp.so if exec cmsd xrd.port <%= @cms_port %> fi if exec xrootd - xrd.port <%= @xrootd_port %> + xrd.protocol http:<%= @xrootd_port %> libXrdHttp.so + xrd.port <%= @xrootd_port %> fi # Upon last testing, the plugin did not yet work in async mode From 7470aa6da908f3041e223793971403d5dcad65be Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 29 Nov 2024 10:22:54 +0100 Subject: [PATCH 2/4] Use fqdn --- templates/xrootd/docker-compose.erb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/xrootd/docker-compose.erb.yml b/templates/xrootd/docker-compose.erb.yml index da930d43..6110b1b3 100644 --- a/templates/xrootd/docker-compose.erb.yml +++ b/templates/xrootd/docker-compose.erb.yml @@ -3,7 +3,7 @@ services: image: <%= @container_image %>:<%= @container_tag %> dns: - 89.32.32.32 - hostname: <%= @hostname.split('.')[0] %> + hostname: <%= @hostname %> network_mode: host extra_hosts: <%- @cms_allow_hosts.each do |extra_host| -%> @@ -26,7 +26,7 @@ services: image: <%= @container_image %>:<%= @container_tag %> dns: - 89.32.32.32 - hostname: <%= @hostname.split('.')[0] %> + hostname: <%= @hostname %> network_mode: host extra_hosts: <%- @cms_allow_hosts.each do |extra_host| -%> From 86893fd9c2fda57f9a6266f190c1908026c65beb Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 29 Nov 2024 10:25:07 +0100 Subject: [PATCH 3/4] Use cms port --- templates/xrootd/xrootd-manager.cfg.erb | 2 +- templates/xrootd/xrootd-server.cfg.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/xrootd/xrootd-manager.cfg.erb b/templates/xrootd/xrootd-manager.cfg.erb index 1b404a4b..c3980ee2 100644 --- a/templates/xrootd/xrootd-manager.cfg.erb +++ b/templates/xrootd/xrootd-manager.cfg.erb @@ -17,7 +17,7 @@ all.export <%= @export %> # Set the role to either proxy manager or proxy server all.adminpath <%= @xrootd_admin_path %> all.pidpath <%= @xrootd_admin_path %> -all.manager all <%= @manager_domain %>+ <%= @xrootd_port %> +all.manager all <%= @manager_domain %>+ <%= @cms_port %> all.role manager # Tell the cmsd which machines are allowed to connects diff --git a/templates/xrootd/xrootd-server.cfg.erb b/templates/xrootd/xrootd-server.cfg.erb index 8827803f..40549342 100644 --- a/templates/xrootd/xrootd-server.cfg.erb +++ b/templates/xrootd/xrootd-server.cfg.erb @@ -17,7 +17,7 @@ all.export <%= @export %> # Set the role to either proxy manager or proxy server all.adminpath <%= @xrootd_admin_path %> all.pidpath <%= @xrootd_admin_path %> -all.manager all <%= @manager_domain %>+ <%= @xrootd_port %> +all.manager all <%= @manager_domain %>+ <%= @cms_port %> all.role server # Tell the cmsd which machines are allowed to connects From 1267dbe9d4975a25d204e0abd962506bd9dcf95a Mon Sep 17 00:00:00 2001 From: Anders Oskarsen Date: Mon, 2 Dec 2024 10:18:12 +0100 Subject: [PATCH 4/4] Disable AUTO_WATCH_NEW_REPOS --- templates/forgejo/app.ini.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/forgejo/app.ini.erb b/templates/forgejo/app.ini.erb index 032cd69e..01528a92 100644 --- a/templates/forgejo/app.ini.erb +++ b/templates/forgejo/app.ini.erb @@ -52,6 +52,7 @@ EMAIL_DOMAIN_ALLOWLIST = <%= @email_domain_whitelist %> ALLOW_ONLY_EXTERNAL_REGISTRATION = true SHOW_REGISTRATION_BUTTON = false ENABLE_NOTIFY_MAIL = true +AUTO_WATCH_NEW_REPOS = false [CORS] ALLOW_DOMAIN = sunet.se