From 438acaad1e4f8f1ad213a50e1430dd3af9b6ea7e Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Thu, 4 Jun 2020 14:37:06 -0400
Subject: [PATCH] more dependency tweaks

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/src/extras/install/Makefile.centos | 16 ++++++++++------
 Open-ILS/src/extras/install/Makefile.rhel   |  4 +---
 docs/installation/server_installation.adoc  | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/extras/install/Makefile.centos b/Open-ILS/src/extras/install/Makefile.centos
index 5b8dc4e9ba..090f469891 100644
--- a/Open-ILS/src/extras/install/Makefile.centos
+++ b/Open-ILS/src/extras/install/Makefile.centos
@@ -31,6 +31,7 @@ RPMS = \
 	perl-DBD-Pg \
 	perl-Email-Simple \
 	perl-Email-MIME \
+	perl-List-MoreUtils \
 	perl-Locale-Codes \
 	perl-Module-Pluggable \
 	perl-Net-IP \
@@ -56,14 +57,15 @@ export CPAN_MODULES = \
 	GD \
 	GD::Graph3d \
 	HTML::Defang \
+	HTTP::Daemon \
 	Locale::Maketext::Lexicon \
-	MARC \
 	MARC::Charset \
 	Net::SSH2 \
 	RPC::XML \
 	Text::Aspell \
 	Excel::Writer::XLSX \
 	Business::ISSN \
+	Net::LDAP \
 	Net::Z3950::ZOOM \
 	Net::Z3950::Simple2ZOOM \
 	Net::Z3950::SimpleServer \
@@ -74,8 +76,7 @@ export CPAN_MODULES = \
 export CPAN_MODULES_PGSQL = \
 	Business::ISBN \
 	Library::CallNumber::LC \
-	MARC::Record \
-	MARC::XML
+	MARC::Record 
 
 export CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301 \
@@ -91,8 +92,9 @@ PGSQL_RPMS = \
 DEVELOPER_RPMS = \
 	autoconf \
 	automake \
-	chromium-headless \
-	firefox
+	chromium \
+	firefox \
+	nodejs 
 
 all: install_indexdata_repo install_rpms install_cpan
 
@@ -113,8 +115,10 @@ install_rpms:
 	yum -y install $(RPMS)
 
 install_developer:
+	curl -sL https://rpm.nodesource.com/setup_12.x | bash -
 	yum -y install $(DEVELOPER_RPMS)
-	make -f $(DIR)/Makefile.common install_nodejs_from_source
+	npm update
+	npm install -g @angular/cli@^8.2.0
 
 clean:
 	make -f $(DIR)/Makefile.common clean
diff --git a/Open-ILS/src/extras/install/Makefile.rhel b/Open-ILS/src/extras/install/Makefile.rhel
index 5d7d97c151..9e52394b64 100644
--- a/Open-ILS/src/extras/install/Makefile.rhel
+++ b/Open-ILS/src/extras/install/Makefile.rhel
@@ -60,7 +60,6 @@ export CPAN_MODULES = \
 	HTML::Defang \
 	HTTP::Daemon \
 	Locale::Maketext::Lexicon \
-	MARC \
 	MARC::Charset \
 	Net::SSH2 \
 	RPC::XML \
@@ -77,8 +76,7 @@ export CPAN_MODULES = \
 export CPAN_MODULES_PGSQL = \
 	Business::ISBN \
 	Library::CallNumber::LC \
-	MARC::Record \
-	MARC::XML
+	MARC::Record 
 
 export CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301 \
diff --git a/docs/installation/server_installation.adoc b/docs/installation/server_installation.adoc
index f72a85f348..ccc35995b0 100644
--- a/docs/installation/server_installation.adoc
+++ b/docs/installation/server_installation.adoc
@@ -277,6 +277,7 @@ Configure the Apache Web server
 the Evergreen catalog, web staff client, Web services, and administration
 interfaces. Issue the following commands as the *root* Linux account:
 +
+.(Debian/Ubuntu)
 [source,bash]
 ------------------------------------------------------------------------------------
 cp Open-ILS/examples/apache_24/eg_24.conf       /etc/apache2/sites-available/eg.conf
@@ -287,6 +288,17 @@ mkdir /etc/apache2/ssl
 cd /etc/apache2/ssl
 ------------------------------------------------------------------------------------
 +
+.(CentOS/RHEL)
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/httpd/conf.d/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache_24/eg_startup    	/etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------------
++
 . The `openssl` command cuts a new SSL key for your Apache server. For a
 production server, you should purchase a signed SSL certificate, but you can
 just use a self-signed certificate and accept the warnings in the
@@ -436,6 +448,8 @@ make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch
 make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
 make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
 make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-bionic
+make -f Open-ILS/src/extras/Makefile.install postgres-server-centos
+make -f Open-ILS/src/extras/Makefile.install postgres-server-rhel
 ------------------------------------------------------------------------------
 
 To install PostgreSQL version 10, use the following command for your operating
-- 
2.11.0