[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. fcfff08a541b4ed2ed244ea4cb10d53f42128a3b
Evergreen Git
git at git.evergreen-ils.org
Thu Jul 10 14:30:18 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via fcfff08a541b4ed2ed244ea4cb10d53f42128a3b (commit)
via 609d9e1a5d8909f36b8230fd770a846e12c361e3 (commit)
via c49517c581cfc79b6ba0a041cef699452e365847 (commit)
via 2f07808e15e59ed7509bf9432cbd8460e8482313 (commit)
via 3db76b0a36733615dff24ddf9d29d312abadc512 (commit)
via 20b4d685441d3f9ef5ef1cf9b6c0413f283e5dd9 (commit)
via 18b093b528373aff949f05ac1f8ff2188f5e948e (commit)
via 6d84a55fca904e51a311e47f3375228f91cdd17f (commit)
via 7855a9e05f3b9127cc3d055572e8535b147147a6 (commit)
via 585a721bce1fbb1bf6aa2d9da49a93172d29b34b (commit)
via ae32938d760d8862a7cd838d5cd2caf8343db586 (commit)
from 28a5085fd645c9470b852c9700661dbe4cbddf18 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fcfff08a541b4ed2ed244ea4cb10d53f42128a3b
Author: Ben Shum <bshum at biblio.org>
Date: Thu Jul 10 14:25:18 2014 -0400
LP#1315531 Remove remaining references to Lucid from README and Makefile
There were still a few references to Ubuntu Lucid in README and makefile
comments area. Also, the Makefile itself for Lucid was still there.
Remove these last traces forever!
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index c5a90af..3aabf24 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,7 +4,7 @@
#
# Makefile to install prerequisites for OpenSRF and Evergreen
#
-# Currently supports Debian (wheezy, squeeze), Ubuntu (10.04), Ubuntu (12.04) and
+# Currently supports Debian (wheezy, squeeze), Ubuntu (12.04), Ubuntu (14.04) and
# Fedora (16 and 17).
#
# Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
@@ -14,10 +14,10 @@
# - or -
# make -f Makefile.install debian-squeeze
# - or -
-# make -f Makefile.install ubuntu-lucid
-# - or -
# make -f Makefile.install ubuntu-precise
# - or -
+# make -f Makefile.install ubuntu-trusty
+# - or -
# make -f Makefile.install fedora
#
# ---------------------------------------------------------------------
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
deleted file mode 100644
index 3f88c19..0000000
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
+++ /dev/null
@@ -1,127 +0,0 @@
-# install files for Ubuntu 10.04 LTS Lucid Lynx
-
-DIR = $(dir $(lastword $(MAKEFILE_LIST)))
-APT_SAFE_TOOL = aptitude -P
-
-# We need a recent version of Yaz
-# Ubuntu 10.04 comes with 3.0.52
-YAZ=yaz-4.2.32
-YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
-
-export DEBS = \
- apache2-prefork-dev\
- aspell\
- aspell-en\
- libbusiness-creditcard-perl\
- libbusiness-isbn-data-perl\
- libbusiness-isbn-perl\
- libbusiness-onlinepayment-authorizenet-perl\
- libbusiness-onlinepayment-perl\
- libdatetime-format-builder-perl\
- libdatetime-format-iso8601-perl\
- libdatetime-format-mail-perl\
- libdatetime-perl\
- libdatetime-set-perl\
- libdatetime-timezone-perl\
- libdbd-pg-perl\
- libemail-send-perl\
- libemail-simple-perl\
- libgd-graph3d-perl\
- liblocale-maketext-lexicon-perl\
- liblog-log4perl-perl\
- libmarc-charset-perl \
- libmarc-xml-perl \
- libncurses5-dev\
- libnet-ip-perl\
- libnet-ldap-perl \
- libnet-server-perl\
- libnet-ssh2-perl\
- libnet-z3950-zoom-perl \
- libnspr4-dev\
- libole-storage-lite-perl\
- libparent-perl\
- libspreadsheet-writeexcel-perl\
- libssh2-1-dev\
- libtext-aspell-perl\
- libtext-csv-perl\
- libuniversal-require-perl\
- libunix-syslog-perl\
- libuuid-tiny-perl\
- libbz2-dev\
- libtest-warn-perl\
- libtest-output-perl\
- libsoap-lite-perl
-
-export DEB_APACHE_MODS = \
- expires\
- include\
- proxy\
- proxy_http\
- rewrite
-
-export DEB_APACHE_DISMODS = \
- deflate
-
-export CPAN_MODULES = \
- Business::ISSN \
- Business::OnlinePayment::PayPal \
- Library::CallNumber::LC \
- MARC::Record \
- Net::Z3950::Simple2ZOOM \
- RPC::XML \
- Template::Plugin::POSIX \
- SRU \
- Rose::URI \
- Safe
-
-export CPAN_MODULES_FORCE = \
- Business::Stripe \
- Class::DBI::Frozen::301
-
-PGSQL_SERVER_DEBS_91 = \
- postgresql-9.1 \
- postgresql-contrib-9.1 \
- postgresql-plperl-9.1 \
- postgresql-server-dev-9.1
-
-PGSQL_CLIENT_DEBS_91 = \
- libpq5 \
- libpq-dev \
- postgresql-client-9.1
-
-all: install_yaz
- make -f $(DIR)/Makefile.debian install_debs
- make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
- make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
- make -f $(DIR)/Makefile.common install_cpan
- make -f $(DIR)/Makefile.common install_cpan_force
- make -f $(DIR)/Makefile.debian install_js_sm
- make -f $(DIR)/Makefile.debian debian_sys_config
-
-install_yaz:
- if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi;
- tar xzf $(YAZ).tar.gz
- cd $(YAZ) && ./configure && make && make install && ldconfig
-
-install_pgsql_server_debs_91:
- $(APT_TOOL) install $(PGSQL_SERVER_DEBS_91)
-
-install_pgsql_client_backport_debs_91:
- @if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
- then \
- echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
- "of apache2-prefork-dev), but these are the 8.4 versions and they" \
- "conflict with the 9.1 versions - so remove them, install the pinned" \
- "backports of 9.1, then reinstall the apache2-prefork-dev package.\n\n" \
- "**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
- "databases that might currently exist on this machine." && \
- $(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
- fi
- $(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
- $(APT_TOOL) install apache2-prefork-dev
-
-clean:
- make -f $(DIR)/Makefile.common clean
- make -f $(DIR)/Makefile.debian clean
-
-# vim:noet:sw=4:ts=4:
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index d0f8b82..f7c2fd8 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -76,28 +76,15 @@ before you can successfully configure, compile, and install Evergreen.
deb http://backports.debian.org/debian-backports squeeze-backports main contrib
------------------------------------------------------------------------------
+
- * On Ubuntu Lucid, you can use a PPA (personal package archive), which are
- package sources hosted on Launchpad. The one most commonly used by Evergreen
- Community members is maintained by Martin Pitt, who also maintains the
- official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue
- the following commands to add the PPA source:
-+
-[source, bash]
-------------------------------------------------------------------------------
-apt-get install python-software-properties
-add-apt-repository ppa:pitti/postgresql
-------------------------------------------------------------------------------
-+
- * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required.
-+
+ * Ubuntu Precise and Trusty comes with PostgreSQL 9+, so no additional steps are required.
* Fedora comes with PostgreSQL 9, so no additional steps are required.
+
3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
retrieve the new packages from the backports repository.
4. Issue the following commands as the *root* Linux account to install
prerequisites using the `Makefile.install` prerequisite installer,
- substituting `debian-squeeze`, `debian-wheezy`, `fedora`, `ubuntu-lucid`, or
- `ubuntu-precise` for <osname> below:
+ substituting `debian-squeeze`, `debian-wheezy`, `fedora`, `ubuntu-precise`, or
+ `ubuntu-trusty` for <osname> below:
+
[source, bash]
------------------------------------------------------------------------------
@@ -367,7 +354,7 @@ For production use, most libraries install the PostgreSQL database server on a
dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
installer does *not* install the PostgreSQL 9 database server that is required
by every Evergreen system. You can install the packages required by Debian or
-Ubuntu Lucid on the machine of your choice using the following commands as the
+Ubuntu on the machine of your choice using the following commands as the
*root* Linux account:
.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
commit 609d9e1a5d8909f36b8230fd770a846e12c361e3
Author: Ben Shum <bshum at biblio.org>
Date: Thu Jul 10 13:51:50 2014 -0400
LP#1315531 Fix README asciidoc syntax
Noticed when generating the asciidoc output to HTML there was an error in the
README file. This adds the proper syntax around the text blocks.
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index b8f9943..d0f8b82 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -312,6 +312,7 @@ a2enmod mpm_prefork
a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
a2ensite eg.conf
------------------------------------------------------------------------------
++
(Ubuntu Trusty):
+
[source,bash]
@@ -319,7 +320,7 @@ a2ensite eg.conf
a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
a2ensite eg.conf
------------------------------------------------------------------------------
-
++
8. (Ubuntu): As the *root* Linux account, enable Apache to write
to the lock directory; this is currently necessary because Apache
is running as the `opensrf` user:
commit c49517c581cfc79b6ba0a041cef699452e365847
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Jun 18 16:10:18 2014 -0400
LP#1315531 Quick clarification about which Ubuntu we mean.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 3d2f557..b8f9943 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -305,13 +305,21 @@ a2enmod mpm_prefork
6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
file to change references from the non-existent `/etc/apache2/` directory
to `/etc/httpd/`.
-7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site:
+7. (Debian and Ubuntu Precise): As the *root* Linux account, enable the Evergreen site:
+
[source,bash]
------------------------------------------------------------------------------
a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
a2ensite eg.conf
------------------------------------------------------------------------------
+(Ubuntu Trusty):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
+
8. (Ubuntu): As the *root* Linux account, enable Apache to write
to the lock directory; this is currently necessary because Apache
is running as the `opensrf` user:
commit 2f07808e15e59ed7509bf9432cbd8460e8482313
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Tue Jun 3 14:13:47 2014 -0400
LP#1315531 Correcting typo: "eg_host.conf" -> "eg_vhost.conf".
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index dc57e27..3d2f557 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -226,7 +226,7 @@ cd /etc/apache2/ssl
[source,bash]
------------------------------------------------------------------------------------
cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
-cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_host.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
cp Open-ILS/examples/apache/eg_startup /etc/apache2/
# Now set up SSL
mkdir /etc/apache2/ssl
commit 3db76b0a36733615dff24ddf9d29d312abadc512
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Sat May 31 16:25:29 2014 -0400
LP#1315531 Adding further changes to the server install docs for Ubuntu 14.04:
- adding apache configuration instructions that adjust for the new
mpm_prefork module in Apache 2.4 on 14.04
- adding new standalone database dependency installation instructions
that rely on OS packages rather than CPAN where possible
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index d974425..dc57e27 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -108,10 +108,10 @@ make -f Open-ILS/src/extras/Makefile.install <osname>
issuing the following commands as the *root* Linux account:
+
[NOTE]
-You should skip this step if installing on Ubuntu Precise. The ubuntu-precise
-target uses libdbd-pgsql from packages.
+You should skip this step if installing on Ubuntu Precise or Trusty. The ubuntu
+targets use libdbd-pgsql from packages.
+
-.Debian / Ubuntu Lucid
+.Debian
[source, bash]
------------------------------------------------------------------------------
echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
@@ -211,7 +211,7 @@ versions 2.4 or greater) to configure your Web server for the Evergreen
catalog, staff client, Web services, and administration interfaces. Issue the
following commands as the *root* Linux account:
+
-.Debian and Ubuntu
+.Debian and Ubuntu Precise
[source,bash]
------------------------------------------------------------------------------
cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
@@ -222,6 +222,17 @@ mkdir /etc/apache2/ssl
cd /etc/apache2/ssl
------------------------------------------------------------------------------
+
+.Ubuntu Trusty
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_host.conf
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
.Fedora
[source,bash]
------------------------------------------------------------------------------
@@ -267,8 +278,9 @@ place.
a request timing out unexpectedly, but increase the risk of using up
all available Apache child processes.
b. 'Optional': Change `MaxKeepAliveRequests` to `100`
- c. Update the prefork configuration section to suit your environment. The
- following settings apply to a busy system:
+ c. (Debian, Ubuntu Precise, and Fedora) Update the prefork configuration
+ section to suit your environment. The following settings apply to a busy
+ system:
+
[source,bash]
------------------------------------------------------------------------------
@@ -280,6 +292,15 @@ place.
MaxRequestsPerChild 10000
</IfModule>
------------------------------------------------------------------------------
+ d. (Ubuntu Trusty) As the *root* user, edit
+ /etc/apache2/mods-available/mpm_prefork.conf to match the above values.
+ Then, also as the *root* user, enable the mpm_prefork module by doing:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
+
6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
file to change references from the non-existent `/etc/apache2/` directory
@@ -351,8 +372,8 @@ command below based on your operating system.
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze
-make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-lucid
make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
------------------------------------------------------------------------------
@@ -367,23 +388,28 @@ postgresql-setup initdb
systemctl start postgresql
------------------------------------------------------------------------------
-For a standalone PostgreSQL server, install the following Perl modules as the
-*root* Linux account:
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
-.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server
-[source, bash]
-------------------------------------------------------------------------------
-aptitude install gcc libxml-libxml-perl libxml-libxslt-perl
-cpan Business::ISBN
-cpan JSON::XS
-cpan Library::CallNumber::LC
-cpan MARC::Record
-cpan MARC::File::XML
-cpan UUID::Tiny
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+apt-get install gcc libxml-libxml-perl libxml-libxslt-perl libbusiness-isbn-perl
+apt-get install libjson-xs-perl liblibrary-callnumber-lc-perl libmarc-record-perl
+apt-get install libmarc-xml-perl libuuid-tiny-perl
cpan Rose::URI
-------------------------------------------------------------------------------
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty)
+standalone PostgreSQL 9 server
+[source,bash]
+---------------------------------------------------------------------------------
+apt-get install gcc libxml-libxml-perl libxml-libxslt-perl libbusiness-isbn-perl
+apt-get install libjson-xs-perl liblibrary-callnumber-lc-perl libmarc-record-perl
+apt-get install libmarc-xml-perl libuuid-tiny-perl librose-uri-perl
+---------------------------------------------------------------------------------
-.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server
+.(Fedora)
[source, bash]
------------------------------------------------------------------------------
yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN
commit 20b4d685441d3f9ef5ef1cf9b6c0413f283e5dd9
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu May 29 22:17:10 2014 -0400
LP#1315531 Ben Shum pointed out an error, which I have now corrected.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/configure.ac b/configure.ac
index 48bfa39..fbfa232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,7 +236,7 @@ AC_SUBST([LIBXML2_HEADERS])
AC_ARG_WITH([dbi],
[ --with-dbi=path location of the libdbi driver libraries (default is /usr/lib/x86_64-linux-gnu/dbd/)],
[DBI_LIBS=${withval}],
-[DBI_LIBS=/usr/local/lib/dbd/])
+[DBI_LIBS=/usr/lib/x86_64-linux-gnu/dbd/])
# If the passed in value doesn't work, fall back to reasonable defaults
# Distributions are starting to package a good version of libdbi / libdbd
commit 18b093b528373aff949f05ac1f8ff2188f5e948e
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu May 29 15:49:38 2014 -0400
LP#1315531 Change default location of libdbi libraries.
In libdbi 0.8.4, the default installed location has changed to
/usr/lib/x86_64-linux-gnu/dbd/. On the advice of Thomas Berezansky,
I made the new location the default and ensured that the previous
locations are in the fallback.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/configure.ac b/configure.ac
index 99370e4..48bfa39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,7 @@ AC_ARG_WITH([libxml2],
AC_SUBST([LIBXML2_HEADERS])
AC_ARG_WITH([dbi],
-[ --with-dbi=path location of the libdbi driver libraries (default is /usr/local/lib/dbd)],
+[ --with-dbi=path location of the libdbi driver libraries (default is /usr/lib/x86_64-linux-gnu/dbd/)],
[DBI_LIBS=${withval}],
[DBI_LIBS=/usr/local/lib/dbd/])
commit 6d84a55fca904e51a311e47f3375228f91cdd17f
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu Apr 3 14:22:33 2014 -0400
LP#1315531 Missed libtest-output-perl in the deb list.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 6ef5721..aa46dbf 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -51,6 +51,7 @@ export DEBS = \
libsru-perl\
libssh2-1-dev\
libtemplate-plugin-posix-perl\
+ libtest-output-perl\
libtext-aspell-perl\
libtext-csv-perl\
libuniversal-require-perl\
commit 7855a9e05f3b9127cc3d055572e8535b147147a6
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu Apr 3 14:11:11 2014 -0400
LP#1315531 Adding Business::Stripe; Moving CPAN stuff to debs where I can
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 375e35e..6ef5721 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -45,10 +45,12 @@ export DEBS = \
libbz2-dev \
libpq5\
libpq-dev\
+ librose-uri-perl\
librpc-xml-perl\
libspreadsheet-writeexcel-perl\
libsru-perl\
libssh2-1-dev\
+ libtemplate-plugin-posix-perl\
libtext-aspell-perl\
libtext-csv-perl\
libuniversal-require-perl\
@@ -73,8 +75,7 @@ export DEB_APACHE_DISMODS = \
export CPAN_MODULES = \
Business::CreditCard::Object \
Business::OnlinePayment::PayPal \
- Template::Plugin::POSIX \
- Rose::URI \
+ Business::Stripe \
Safe
export CPAN_MODULES_FORCE = \
commit 585a721bce1fbb1bf6aa2d9da49a93172d29b34b
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu Apr 3 12:54:45 2014 -0400
LP#1315531 Continuing to add trusty support and remove lucid.
Adding PostgreSQL 9.3 as the default database for 14.04.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 906ed3d..c5a90af 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -67,8 +67,8 @@ debian-wheezy:
@make -f $(DIR)/Makefile.debian-wheezy
debian-squeeze:
@make -f $(DIR)/Makefile.debian-squeeze
-ubuntu-lucid:
- @make -f $(DIR)/Makefile.ubuntu-lucid
+ubuntu-trusty:
+ @make -f $(DIR)/Makefile.ubuntu-trusty
ubuntu-precise:
@make -f $(DIR)/Makefile.ubuntu-precise
fedora:
@@ -78,8 +78,8 @@ postgres-server-debian-wheezy:
@make -f $(DIR)/Makefile.debian-wheezy install_postgres_server
postgres-server-debian-squeeze:
@make -f $(DIR)/Makefile.debian-squeeze install_postgres_server
-postgres-server-ubuntu-lucid:
- @make -f $(DIR)/Makefile.ubuntu-lucid install_postgres_server
+postgres-server-ubuntu-trusty:
+ @make -f $(DIR)/Makefile.ubuntu-trusty install_postgres_server
postgres-server-ubuntu-precise:
@make -f $(DIR)/Makefile.ubuntu-precise install_postgres_server
postgres-server-fedora:
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 418f3b8..375e35e 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -55,7 +55,7 @@ export DEBS = \
libunix-syslog-perl\
libuuid-tiny-perl\
libyaz-dev\
- postgresql-client-9.1\
+ postgresql-client-9.3\
libsoap-lite-perl\
libtest-warn-perl\
yaz
@@ -80,11 +80,11 @@ export CPAN_MODULES = \
export CPAN_MODULES_FORCE = \
Class::DBI::Frozen::301
-PGSQL_SERVER_DEBS_91 = \
- postgresql-9.1 \
- postgresql-contrib-9.1 \
- postgresql-plperl-9.1 \
- postgresql-server-dev-9.1
+PGSQL_SERVER_DEBS_93 = \
+ postgresql-9.3 \
+ postgresql-contrib-9.3 \
+ postgresql-plperl-9.3 \
+ postgresql-server-dev-9.3
all:
make -f $(DIR)/Makefile.debian install_debs
@@ -95,7 +95,7 @@ all:
make -f $(DIR)/Makefile.debian debian_sys_config
install_postgres_server:
- make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
+ make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_93)"
clean:
make -f $(DIR)/Makefile.common clean
commit ae32938d760d8862a7cd838d5cd2caf8343db586
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Fri Feb 7 06:14:52 2014 -0500
LP#1315531 adding trusty Makefile.install, removing lucid support
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
new file mode 100644
index 0000000..418f3b8
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -0,0 +1,104 @@
+# install files for Ubuntu 14.04 LTS Trusty Tahr
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+export DEBS = \
+ apache2-prefork-dev\
+ aspell\
+ aspell-en\
+ libbusiness-creditcard-perl\
+ libbusiness-edi-perl \
+ libbusiness-isbn-data-perl\
+ libbusiness-isbn-perl\
+ libbusiness-issn-perl\
+ libbusiness-onlinepayment-authorizenet-perl\
+ libbusiness-onlinepayment-perl\
+ libdatetime-format-builder-perl\
+ libdatetime-format-iso8601-perl\
+ libdatetime-format-mail-perl\
+ libdatetime-perl\
+ libdatetime-set-perl\
+ libdatetime-timezone-perl\
+ libdbd-pg-perl\
+ libdbd-pgsql \
+ libdbi-dev \
+ libemail-send-perl\
+ libemail-simple-perl\
+ libgd-graph3d-perl\
+ liblibrary-callnumber-lc-perl \
+ liblocale-maketext-lexicon-perl\
+ liblog-log4perl-perl\
+ libmarc-charset-perl \
+ libmarc-record-perl\
+ libmarc-xml-perl \
+ libncurses5-dev\
+ libnet-https-any-perl \
+ libnet-ip-perl\
+ libnet-ldap-perl \
+ libnet-server-perl\
+ libnet-ssh2-perl\
+ libnet-z3950-simple2zoom-perl\
+ libnet-z3950-simpleserver-perl\
+ libnet-z3950-zoom-perl \
+ libnspr4-dev\
+ libole-storage-lite-perl\
+ libbz2-dev \
+ libpq5\
+ libpq-dev\
+ librpc-xml-perl\
+ libspreadsheet-writeexcel-perl\
+ libsru-perl\
+ libssh2-1-dev\
+ libtext-aspell-perl\
+ libtext-csv-perl\
+ libuniversal-require-perl\
+ libunix-syslog-perl\
+ libuuid-tiny-perl\
+ libyaz-dev\
+ postgresql-client-9.1\
+ libsoap-lite-perl\
+ libtest-warn-perl\
+ yaz
+
+export DEB_APACHE_MODS = \
+ expires\
+ include\
+ proxy\
+ proxy_http\
+ rewrite
+
+export DEB_APACHE_DISMODS = \
+ deflate
+
+export CPAN_MODULES = \
+ Business::CreditCard::Object \
+ Business::OnlinePayment::PayPal \
+ Template::Plugin::POSIX \
+ Rose::URI \
+ Safe
+
+export CPAN_MODULES_FORCE = \
+ Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_91 = \
+ postgresql-9.1 \
+ postgresql-contrib-9.1 \
+ postgresql-plperl-9.1 \
+ postgresql-server-dev-9.1
+
+all:
+ make -f $(DIR)/Makefile.debian install_debs
+ make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
+ make -f $(DIR)/Makefile.common install_cpan
+ make -f $(DIR)/Makefile.common install_cpan_force
+ make -f $(DIR)/Makefile.debian install_js_sm
+ make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_postgres_server:
+ make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
+
+clean:
+ make -f $(DIR)/Makefile.common clean
+ make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/extras/Makefile.install | 14 +-
Open-ILS/src/extras/install/Makefile.ubuntu-lucid | 127 --------------------
...efile.ubuntu-precise => Makefile.ubuntu-trusty} | 24 ++--
configure.ac | 4 +-
docs/installation/server_installation.txt | 100 ++++++++++------
5 files changed, 82 insertions(+), 187 deletions(-)
delete mode 100644 Open-ILS/src/extras/install/Makefile.ubuntu-lucid
copy Open-ILS/src/extras/install/{Makefile.ubuntu-precise => Makefile.ubuntu-trusty} (86%)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list