diff --git a/manifests/config.pp b/manifests/config.pp index 6353e3ea..22c07ca2 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -5,7 +5,6 @@ class gitlab::config { # get variables from the toplevel manifest for usage in the template - $ci_external_url = $::gitlab::ci_external_url $ci_nginx = $::gitlab::ci_nginx $ci_nginx_eq_nginx = $::gitlab::ci_nginx_eq_nginx $ci_redis = $::gitlab::ci_redis diff --git a/manifests/init.pp b/manifests/init.pp index 45443d7d..53088a94 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -82,10 +82,6 @@ # Default: /etc/gitlab/gitlab.rb # Path of the Gitlab Omnibus config file. # -# [*ci_external_url*] -# Default: undef -# External URL of Gitlab CI. -# # [*ci_nginx_eq_nginx*] # Default: false # Replicate the CI Nginx config from the Gitlab Nginx config. @@ -271,7 +267,6 @@ # # class { 'gitlab': # edition => 'ee', -# ci_external_url => 'https://myci.mydomain.tld', # external_url => 'https://gitlab.mydomain.tld', # nginx => { redirect_http_to_https => true }, # ci_nginx_eq_nginx => true, @@ -309,7 +304,6 @@ $service_provider = $::gitlab::params::service_provider, # gitlab specific $edition = 'ce', - $ci_external_url = undef, $ci_nginx = undef, $ci_nginx_eq_nginx = false, $ci_redis = undef, @@ -378,7 +372,6 @@ validate_bool($ci_nginx_eq_nginx) if $ci_redis { validate_hash($ci_redis) } if $ci_unicorn { validate_hash($ci_unicorn) } - if $ci_external_url { validate_string($ci_external_url) } validate_string($external_url) if $git { validate_hash($git) } if $git_data_dir { validate_absolute_path($git_data_dir) } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index b75e7683..af4c9751 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -155,12 +155,6 @@ .with_content(/^\s*external_port '987654'$/) } end - describe 'ci_external_url' do - let(:params) { {:ci_external_url => 'http://gitlabci.mycompany.com/'} } - it { is_expected.to contain_file('/etc/gitlab/gitlab.rb') \ - .with_content(/^\s*ci_external_url 'http:\/\/gitlabci\.mycompany\.com\/'$/) - } - end describe 'nginx' do let(:params) { {:nginx => { 'enable' => true,