Merge branch 'testing'

SUNET · Dec 3, 2024 · fa2994c · fa2994c
2 parents 2969d04 + 1267dbe
commit fa2994c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git 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/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

diff --git 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| -%>

diff --git 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
@@ -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
@@ -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
@@ -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