Skip to content

Commit

Permalink
SYS-207 - Remove all mirlyn.lib handling from nebula
Browse files Browse the repository at this point in the history
This helps us simplify www-lib by moving these simple redirects off to
a Kubernetes Ingress.
  • Loading branch information
botimer committed May 3, 2021
1 parent bfb0111 commit bcf883d
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 147 deletions.
23 changes: 0 additions & 23 deletions doc/www-lib-crons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,29 +58,6 @@ marsala:
command: 'bash -c "export PATH=/l/local/rbenv/bin:/l/local/rbenv/shims:\$PATH; /usr/sbin/logrotate -s /www/www.mblem/app/releases/20140228204112/log/rotate.state /www/www.mblem/app/releases/20140228204112/log/rotate.conf >> /www/www.mblem/app/releases/20140228204112/log/cron.log 2>&1"'
porter:
nebula::profile::www_lib::cron::extra_jobs:
'Pull down the latest High Level Browse extract':
user: 'libadm'
environment: ['[email protected]']
hour: 19
minute: 48
command: '/usr/bin/perl /www/vufind/hlb3/hlb3_extract.pl > /www/vufind/web/mirlyn/web/static/hlb3/hlb3.json'
'Generate facet values from solr for use in Advanced search (e.g. list of languages)':
user: 'libadm'
environment: ['[email protected]']
hour: 19
minute: 49
command: '/bin/bash /www/vufind/facetlists/getall.sh'
'Clean out expired sessions every 15mn':
user: 'libadm'
environment: ['[email protected]']
minute: [0, 15, 30, 45]
command: '/usr/bin/perl /www/vufind/cronjobs/clean_sessions.pl'
'Get the HT namespace mapping for use in display':
user: 'libadm'
environment: ['[email protected]']
hour: 3
minute: 8
command: '/usr/bin/php /www/vufind/cronjobs/getHTNamespaceMap.php > /www/vufind/facetlists/ht_namespaces.php'
'Datamart: update valuemaps':
user: 'libadm'
environment: ['[email protected]']
Expand Down
90 changes: 0 additions & 90 deletions manifests/apache/mirlyn_vhost.pp

This file was deleted.

11 changes: 0 additions & 11 deletions manifests/profile/www_lib/apache.pp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
'open.umich.edu',
'michiganelt.org',
'med.lib.umich.edu',
'mirlyn.lib.umich.edu',
'staff.lib.umich.edu',
'search.lib.umich.edu',
'www.digitalculture.org',
Expand Down Expand Up @@ -141,14 +140,4 @@
include nebula::profile::www_lib::vhosts::midaily
include nebula::profile::www_lib::vhosts::publishing
include nebula::profile::www_lib::vhosts::med

nebula::apache::mirlyn_vhost { 'mirlyn':
domain => 'lib.umich.edu',
app_url => 'http://app-mirlyn-api-production:30730/',
}
nebula::apache::mirlyn_vhost { 'm.mirlyn':
domain => 'lib.umich.edu',
app_url => 'http://app-mirlyn-api-production:30730/',
prefix => 'm.',
}
}
22 changes: 0 additions & 22 deletions spec/classes/role/www_lib_vm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -141,28 +141,6 @@
.with_servername('open.umich.edu')
end

it do
is_expected.to contain_apache__vhost('vufind-http-mirlyn')
.with_servername('mirlyn.lib.umich.edu')
end

it do
is_expected.to contain_apache__vhost('vufind-https-mirlyn')
.with_ssl_cert('/etc/ssl/certs/mirlyn.lib.umich.edu.crt')
.with_servername('mirlyn.lib.umich.edu')
end

it do
is_expected.to contain_apache__vhost('vufind-http-m.mirlyn')
.with_servername('m.mirlyn.lib.umich.edu')
end

it do
is_expected.to contain_apache__vhost('vufind-https-m.mirlyn')
.with_ssl_cert('/etc/ssl/certs/mirlyn.lib.umich.edu.crt')
.with_servername('m.mirlyn.lib.umich.edu')
end

it do
is_expected.to contain_apache__vhost('staff.lib http redirect')
.with_servername('staff.lib.umich.edu')
Expand Down
2 changes: 1 addition & 1 deletion templates/profile/apache/authz_umichlib.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ DBDPrepareSQL "SELECT coll, dlpsPath, dlpsAuthenMethod, dlpsAuthzType FROM aa_co
DBDriver oracle

DLPSAuthExemptionPolicy checkOnlyListed
DLPSAuthExemptionPaths /www/www.lib/cgi /www/staff.lib/web/coral /www/staff.lib/web/linkscan /www/staff.lib/web/linkscan117 /www/staff.lib/web/pagerate /www/staff.lib/web/ptf /www/staff.lib/web/ts /www/staff.lib/web/sites/staff.lib.umich.edu/local /www/staff.lib/web/funds_transfer /www/staff.lib/web/sites/staff.lib.umich.edu.funds_transfer /www/vufind/web/bmc/web /tb/www.lib/instruction-request /instruction/request
DLPSAuthExemptionPaths /www/www.lib/cgi /www/staff.lib/web/coral /www/staff.lib/web/linkscan /www/staff.lib/web/linkscan117 /www/staff.lib/web/pagerate /www/staff.lib/web/ptf /www/staff.lib/web/ts /www/staff.lib/web/sites/staff.lib.umich.edu/local /www/staff.lib/web/funds_transfer /www/staff.lib/web/sites/staff.lib.umich.edu.funds_transfer /tb/www.lib/instruction-request /instruction/request
DLPSAuthFilenameHandlers application/x-httpd-php bwshare-info bwshare-trace cgi-script cosign redirect-handler server-status drupal_security_do_not_remove_see_sa_2006_006 fcgid-script drupal_security_do_not_remove_see_sa_2013_003 shib-handler proxy:unix:/run/php/php7.3-fpm.sock|fcgi://localhost
DLPSAuthURIHandlers jakarta-servlet proxy-server

0 comments on commit bcf883d

Please sign in to comment.