diff --git a/bin/rmt-cli b/bin/rmt-cli index e47abaa3f..1ce207efc 100755 --- a/bin/rmt-cli +++ b/bin/rmt-cli @@ -14,12 +14,8 @@ require 'rmt/config' # don't run as root if Process.euid == 0 - - group = Settings&.[](:cli)&.[](:group) || RMT::DEFAULT_GROUP - user = Settings&.[](:cli)&.[](:user) || RMT::DEFAULT_USER - - Process::Sys.setegid(Etc.getgrnam(group).gid) - Process::Sys.seteuid(Etc.getpwnam(user).uid) + Process::Sys.seteuid(Etc.getpwnam(RMT::DEFAULT_USER).uid) + Process::Sys.setegid(Etc.getgrnam(RMT::DEFAULT_GROUP).gid) end relative_load_paths = %w[lib lib/rmt app/models app/services].map { |dir| File.join(rmt_path, dir) } diff --git a/config/rmt.yml b/config/rmt.yml index bf3cd710d..a3bc11f90 100644 --- a/config/rmt.yml +++ b/config/rmt.yml @@ -32,10 +32,6 @@ mirroring: rails: port: 4224 -cli: - user: _rmt - group: nginx - http_client: verbose: false proxy: diff --git a/package/rmt-server.changes b/package/rmt-server.changes index 433f042e3..75dcc8e16 100644 --- a/package/rmt-server.changes +++ b/package/rmt-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 3 08:50:43 UTC 2018 - tmuntaner@suse.com + +- Removed ability to change user/group through configuration (GH-144) + See: https://github.com/SUSE/rmt/pull/154 + ------------------------------------------------------------------- Thu Apr 26 14:58:45 UTC 2018 - tmuntaner@suse.com diff --git a/package/rmt.conf b/package/rmt.conf index 1eefd0b0a..3aaffb319 100644 --- a/package/rmt.conf +++ b/package/rmt.conf @@ -20,10 +20,6 @@ mirroring: rails: port: 4224 -cli: - user: _rmt - group: nginx - http_client: verbose: false proxy: