allow for configurable facl domain (#2398)

OSC · Dec 1, 2022 · 99219f2 · 99219f2
1 parent b040e2f
commit 99219f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/apps/dashboard/app/models/permission.rb b/apps/dashboard/app/models/permission.rb
@@ -89,7 +89,8 @@ def destroy
   def acl_entry(principle)
     flags = []
     flags << :g if group
-    OodSupport::ACLs::Nfs4Entry.new(type: :A, flags: flags, principle: principle.to_s, domain: 'osc.edu',
+    domain = Configuration.facl_domain
+    OodSupport::ACLs::Nfs4Entry.new(type: :A, flags: flags, principle: principle.to_s, domain: domain,
                                     permissions: [:r, :x])
   end
 

diff --git a/apps/dashboard/config/configuration_singleton.rb b/apps/dashboard/config/configuration_singleton.rb
@@ -56,6 +56,7 @@ def string_configs
     {
       :module_file_dir      => nil,
       :user_settings_file   => '.ood',
+      :facl_domain => nil,
     }.freeze
   end
 

diff --git a/apps/dashboard/test/fixtures/config/ondemand.d/string.yml b/apps/dashboard/test/fixtures/config/ondemand.d/string.yml
@@ -1,2 +1,3 @@
 module_file_dir: 'string from file'
 user_settings_file: 'string from file'
+facl_domain: 'string from file'