Fixes #28904 - make REMOTE_USER_ENVIRON_NAME configurable

theforeman · Jan 31, 2020 · 33e6580 · 33e6580
1 parent 5bf0f38
commit 33e6580
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -48,6 +48,9 @@
 # @param servername
 #   Server name of the VirtualHost in the webserver
 #
+# @param remote_user_environ_name
+#   Django remote user environment variable
+#
 # @example
 #   include pulpcore
 class pulpcore (
@@ -66,7 +69,8 @@
   String $postgresql_db_password = extlib::cache_data('pulpcore_cache_data', 'db_password', extlib::random_password(32)),
   String $django_secret_key = extlib::cache_data('pulpcore_cache_data', 'secret_key', extlib::random_password(32)),
   Integer[0] $redis_db = 8,
-  Stdlib::Fqdn $servername = $facts['fqdn']
+  Stdlib::Fqdn $servername = $facts['fqdn'],
+  Optional[String] $remote_user_environ_name = undef,
 ) {
 
   $settings_file = "${config_dir}/settings.py"

diff --git a/spec/classes/pulpcore_spec.rb b/spec/classes/pulpcore_spec.rb
@@ -7,6 +7,7 @@
 
       it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_package('python3-pulpcore') }
+      it { is_expected.to contain_concat__fragment('base').without_content(/REMOTE_USER_ENVIRON_NAME/) }
 
       context 'with a plugin' do
         let(:pre_condition) { "pulpcore::plugin { 'myplugin': }" }

diff --git a/templates/settings.py.erb b/templates/settings.py.erb
@@ -17,4 +17,6 @@ REDIS_HOST = "localhost"
 REDIS_PORT = "<%= scope['redis::port'] %>"
 REDIS_DB = <%= scope['pulpcore::redis_db'] %>
 WORKING_DIRECTORY = "<%= scope['pulpcore::cache_dir'] %>"
-REMOTE_USER_ENVIRON_NAME = 'HTTP_REMOTE_USER'
+<% if scope['pulpcore::remote_user_environ_name'] != '' -%>
+REMOTE_USER_ENVIRON_NAME = '<%= scope['pulpcore::remote_user_environ_name'] %>'
+<% end -%>