Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions files/imgsrv/catprocio

This file was deleted.

1 change: 0 additions & 1 deletion manifests/profile/hathitrust/apache/babel.pp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
"ASSERTION_EMAIL ${sdremail}",
"PTSEARCH_SOLR ${ptsearch_solr}",
"PTSEARCH_SOLR_BASIC_AUTH ${ptsearch_solr_basic_auth}",
'USE_CATPROCIO 1'
] + if($prod_crms_instance) {
['CRMS_INSTANCE production']
} else {[] },
Expand Down
6 changes: 0 additions & 6 deletions manifests/profile/hathitrust/dependencies.pp
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,4 @@
}

ensure_packages(['mariadb-client'])

file { '/usr/local/bin/catprocio':
ensure => 'file',
content => file('nebula/imgsrv/catprocio'),
mode => '0755',
}
}
7 changes: 0 additions & 7 deletions manifests/profile/hathitrust/imgsrv.pp
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,4 @@
mode => '0755',
source => "https://${http_files}/ae-utils/bins/startup_app"
}

file { '/etc/sudoers.d/imgsrv-catprocio':
ensure => 'file',
content => 'nobody ALL=(root) NOPASSWD: /usr/local/bin/catprocio',
require => Package['sudo'],
}
ensure_packages(['sudo'])
}
19 changes: 0 additions & 19 deletions manifests/profile/hathitrust/slip.pp

This file was deleted.

1 change: 0 additions & 1 deletion manifests/role/hathitrust/ingest_indexing.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
include nebula::profile::hathitrust::networking

include nebula::profile::hathitrust::ingest_hosts
include nebula::profile::hathitrust::slip

file { '/home/libadm':
ensure => 'directory',
Expand Down
1 change: 0 additions & 1 deletion manifests/role/hathitrust/solr/indexing.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@
class nebula::role::hathitrust::solr::indexing {
include nebula::role::hathitrust::solr
include nebula::profile::ruby
include nebula::profile::hathitrust::slip
include nebula::profile::openjdk_java
}
1 change: 0 additions & 1 deletion manifests/role/webhost/htvm/site_primary.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@
class nebula::role::webhost::htvm::site_primary {
include nebula::role::webhost::htvm::prod
include nebula::profile::hathitrust::cron::mdp_misc
include nebula::profile::hathitrust::slip
}
2 changes: 0 additions & 2 deletions spec/classes/profile/hathitrust/dependencies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
if os == "debian-11-x86_64"
it { is_expected.to contain_package("mariadb-client") }
end

it { is_expected.to contain_file("/usr/local/bin/catprocio") }
end
end
end
2 changes: 0 additions & 2 deletions spec/classes/profile/hathitrust/imgsrv_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
it { is_expected.to contain_file("/usr/local/bin/startup_imgsrv").with_content(%r{^BIND=127.0.0.1:31028}) }

it { is_expected.to contain_file("/etc/systemd/system/imgsrv.service").with_content(%r{ExecStart=/usr/local/bin/startup_imgsrv}) }

it { is_expected.to contain_file("/etc/sudoers.d/imgsrv-catprocio") }
end
end
end
20 changes: 0 additions & 20 deletions spec/classes/profile/hathitrust/slip_spec.rb

This file was deleted.

3 changes: 1 addition & 2 deletions templates/profile/hathitrust/imgsrv/startup_imgsrv.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ SDRDATAROOT=<%= @sdrdataroot %>
SDRROOT=<%= @sdrroot %>
SDR_VIEW=<%= @sdrview %>
BIND=<%= @bind %>
USE_CATPROCIO=1
SCRIPT=$SDRROOT/imgsrv/cgi/imgsrv

export SDRROOT SDRDATAROOT SDR_VIEW USE_CATPROCIO
export SDRROOT SDRDATAROOT SDR_VIEW

/usr/bin/plackup -I $SDRROOT/plack-lib -E production \
-R $SCRIPT.psgi,$SCRIPT,$SDRROOT/bin/rsync.timestamp -s FCGI \
Expand Down