Skip to content
Snippets Groups Projects
Commit 8cd607fc authored by Ian Baum's avatar Ian Baum
Browse files

Merge branch 'john_long-add-support-for-rhel-8-db-key-lookup' into 'master'

Add rhel 8 to helper and selinux files

See merge request gitlab-org/omnibus-gitlab!4501
parents ce7e01d8 b8808e98
No related branches found
No related tags found
No related merge requests found
---
title: Add rhel 8 to helper and selinux files
merge_request: 4501
author:
type: fixed
Loading
Loading
@@ -15,7 +15,7 @@
# limitations under the License.
#
 
if RedhatHelper.system_is_rhel7?
if RedhatHelper.system_is_rhel7? || RedhatHelper.system_is_rhel8?
ssh_keygen_module = 'gitlab-7.2.0-ssh-keygen'
execute "semodule -i /opt/gitlab/embedded/selinux/rhel/7/#{ssh_keygen_module}.pp" do
not_if "getenforce | grep Disabled"
Loading
Loading
Loading
Loading
@@ -3,6 +3,10 @@ class RedhatHelper
platform_family == 'rhel' && platform_version =~ /7\./
end
 
def self.system_is_rhel8?
platform_family == 'rhel' && platform_version =~ /8\./
end
def self.platform_family
case platform
when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment