diff --git a/manifests/profile/hathitrust/apache/babel.pp b/manifests/profile/hathitrust/apache/babel.pp index b4bcf39c3..0e368486c 100644 --- a/manifests/profile/hathitrust/apache/babel.pp +++ b/manifests/profile/hathitrust/apache/babel.pp @@ -76,7 +76,6 @@ apache::vhost { "${servername} ssl": servername => $servername, - serveraliases => ["cf.${servername}"], use_canonical_name => 'On', port => '443', docroot => $sdrroot, diff --git a/manifests/profile/hathitrust/apache/catalog.pp b/manifests/profile/hathitrust/apache/catalog.pp index ed554b4db..276ff52bc 100644 --- a/manifests/profile/hathitrust/apache/catalog.pp +++ b/manifests/profile/hathitrust/apache/catalog.pp @@ -35,7 +35,6 @@ apache::vhost { "${servername} ssl": servername => $servername, - serveraliases => ["cf.${servername}"], use_canonical_name => 'On', port => 443, manage_docroot => false, diff --git a/manifests/profile/hathitrust/apache/www.pp b/manifests/profile/hathitrust/apache/www.pp index 1a0c73660..8d484fa99 100644 --- a/manifests/profile/hathitrust/apache/www.pp +++ b/manifests/profile/hathitrust/apache/www.pp @@ -35,7 +35,6 @@ apache::vhost { "${servername} ssl": servername => $servername, - serveraliases => ["cf.${servername}"], use_canonical_name => 'On', port => '443', manage_docroot => false, diff --git a/spec/classes/profile/hathitrust/apache_spec.rb b/spec/classes/profile/hathitrust/apache_spec.rb index eccbe82d3..7626a231a 100644 --- a/spec/classes/profile/hathitrust/apache_spec.rb +++ b/spec/classes/profile/hathitrust/apache_spec.rb @@ -82,16 +82,6 @@ def multiline2re(string) end end - describe "cloudflare aliases" do - %w[babel catalog www].each do |vhost| - it { - expect(subject).to contain_apache__vhost("#{vhost}.hathitrust.org ssl").with( - serveraliases: ["cf.#{vhost}.hathitrust.org"] - ) - } - end - end - context "with a domain and prefix specified" do let(:params) do {