From 265aa9f8cc12472b347e34a62a8f2655dfb1c51b Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Wed, 20 Sep 2017 11:56:34 -0400 Subject: [PATCH] Lp#1718459: Remove Debian 7 Wheezy installation support. Remove references to Debian 7 Wheezy in the README. Remove src/extras/Makefile.install targets for Wheezy. Remove the examples/apache2 directory, since none of the supported distros come with Apache 2.2 any longer. To test: Simply install on a supported distribution other than Debian 7 Wheezy and do the usual tests. Signed-off-by: Jason Stephenson Signed-off-by: Ben Shum --- README | 28 +++-------- examples/apache2/opensrf.conf | 49 ------------------ examples/apache2/websockets/apache2.conf | 64 ------------------------ src/extras/Makefile.install | 14 +----- 4 files changed, 7 insertions(+), 148 deletions(-) delete mode 100644 examples/apache2/opensrf.conf delete mode 100644 examples/apache2/websockets/apache2.conf diff --git a/README b/README index 1df5a1f..414cce8 100644 --- a/README +++ b/README @@ -66,7 +66,6 @@ Well-tested values for include: * `debian-stretch` for Debian 9 * `debian-jessie` for Debian 8 - * `debian-wheezy` for Debian 7 * `ubuntu-trusty` for Ubuntu 14.04 * `ubuntu-xenial` for Ubuntu 16.04 @@ -207,13 +206,13 @@ work for OpenSRF. 1. Stop ejabberd before making any changes to its configuration by issuing the following command as the *root* Linux account: + -.(Debian / Ubuntu Trusty) Stopping ejabberd +.(Ubuntu Trusty) Stopping ejabberd [source, bash] --------------------------------------------------------------------------- /etc/init.d/ejabberd stop --------------------------------------------------------------------------- + -.(Debian Stretch / Ubuntu Xenial) Stopping ejabberd +.(Debian / Ubuntu Xenial) Stopping ejabberd [source, bash] --------------------------------------------------------------------------- systemctl stop ejabberd.service @@ -221,7 +220,7 @@ systemctl stop ejabberd.service + 2. Edit the ejabberd config file. + -(Debian Wheezy / Ubuntu Trusty) Ejabberd 2.x.x:: +(Ubuntu Trusty) Ejabberd 2.x.x:: Open `/etc/ejabberd/ejabberd.cfg` and make the following changes: a. Define your public and private domains in the `hosts` directive. For @@ -285,13 +284,13 @@ hosts: + 3. Restart the ejabberd server to make the changes take effect: + -.(Debian / Ubuntu Trusty) Starting ejabberd +.(Ubuntu Trusty) Starting ejabberd [source, bash] --------------------------------------------------------------------------- /etc/init.d/ejabberd start --------------------------------------------------------------------------- + -.(Debian Stretch / Ubuntu Xenial) Starting ejabberd +.(Debian / Ubuntu Xenial) Starting ejabberd [source, bash] --------------------------------------------------------------------------- systemctl start ejabberd.service @@ -444,13 +443,6 @@ apxs2 -i -a -c mod_websocket.c 3. Create the websocket Apache instance (more information about this in `/usr/share/doc/apache2/README.multiple-instances`) + -.(Debian Wheezy) -[source, bash] ---------------------------------------------------------------------------- -sh /usr/share/doc/apache2.2-common/examples/setup-instance websockets ---------------------------------------------------------------------------- -+ -.(Debian Jessie/Stretch, Ubuntu Trusty/Xenial) [source, bash] --------------------------------------------------------------------------- sh /usr/share/doc/apache2/examples/setup-instance websockets @@ -466,14 +458,6 @@ a2dismod websocket 5. Change to the directory into which you unpacked OpenSRF, then copy into place the config files + -.(Debian Wheezy) -[source, bash] ---------------------------------------------------------------------------- -cd /path/to/opensrf-OSRFVERSION -cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/ ---------------------------------------------------------------------------- -+ -.(Debian Jessie/Stretch, Ubuntu Trusty/Xenial) [source, bash] --------------------------------------------------------------------------- cd /path/to/opensrf-OSRFVERSION @@ -691,7 +675,7 @@ you need to install the `dnsmasq` package, configure it to serve up a DNS entry for localhost, and point your local DNS resolver to `dnsmasq`. For example, on Ubuntu you can issue the following commands as the *root* Linux account: -.(Debian / Ubuntu) Installing and starting `dnsmasq` +.Installing and starting `dnsmasq` [source, bash] --------------------------------------------------------------------------- aptitude install dnsmasq diff --git a/examples/apache2/opensrf.conf b/examples/apache2/opensrf.conf deleted file mode 100644 index 2989dc0..0000000 --- a/examples/apache2/opensrf.conf +++ /dev/null @@ -1,49 +0,0 @@ -# This is a barebones Apache virtual host configuration, suitable -# for testing out the OpenSRF gateway and HTTP translator, and -# that's about it. - -NameVirtualHost *:80 - - ServerName localhost:80 - ServerAlias 127.0.0.1:80 - #DocumentRoot /openils/var/web/ - #DirectoryIndex index.xml index.html index.xhtml - - # ---------------------------------------------------------------------------------- - # Configure the gateway - # ---------------------------------------------------------------------------------- - OSRFGatewayConfig /openils/conf/opensrf_core.xml - # Translator memcache server. Default is localhost - # OSRFTranslatorCacheServer 127.0.0.1:11211 - - # ---------------------------------------------------------------------------------- - # XXX Note, it's important to explicitly set the JSON encoding style - # (OSRFGatewayLegacyJSON), since the default encoding style will likely change - # with OpenSRF 1.0 - # ---------------------------------------------------------------------------------- - # OpenSRF JSON legacy gateway - # ---------------------------------------------------------------------------------- - - SetHandler osrf_json_gateway_module - OSRFGatewayLegacyJSON "true" - allow from all - - # ---------------------------------------------------------------------------------- - # New-style OpenSRF JSON gateway - # ---------------------------------------------------------------------------------- - - SetHandler osrf_json_gateway_module - OSRFGatewayLegacyJSON "false" - allow from all - - - # ---------------------------------------------------------------------------------- - # OpenSRF-over-HTTP translator - # (http://open-ils.org/dokuwiki/doku.php?id=opensrf_over_http) - # ---------------------------------------------------------------------------------- - - SetHandler osrf_http_translator_module - allow from all - - - diff --git a/examples/apache2/websockets/apache2.conf b/examples/apache2/websockets/apache2.conf deleted file mode 100644 index 7afa8f0..0000000 --- a/examples/apache2/websockets/apache2.conf +++ /dev/null @@ -1,64 +0,0 @@ -# This is the main Apache server configuration file for the OpenSRF -# WebSockets gateway. - -# if we don't want to run as "opensrf", change the LockFile -LockFile ${APACHE_LOCK_DIR}/accept.lock -PidFile ${APACHE_PID_FILE} -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} - -DefaultType None -HostnameLookups Off -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# only affects the initial connection, which should be quick. -Timeout 30 - -# WebSockets is KeepAlive on steroids -KeepAlive Off - - - StartServers 5 - MinSpareServers 5 - MaxSpareServers 20 - # use ServerLimit to raise beyond 256 - MaxClients 256 - MaxRequestsPerChild 0 - - -# include the exact mods we need -Include mods-available/mime.load -Include mods-available/mime.conf -# SSL requires mime -Include mods-available/ssl.load -Include mods-available/ssl.conf -Include mods-available/websocket.load - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -# WebSockets via SSL -Listen 7682 -NameVirtualHost *:7682 - - DocumentRoot /var/www - ServerName localhost:7682 - ServerAlias 127.0.0.1:7682 - SSLEngine on - SSLHonorCipherOrder On - SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM - - # re-use the certs from the main apache instance - SSLCertificateFile /etc/apache2/ssl/server.crt - SSLCertificateKeyFile /etc/apache2/ssl/server.key - - -# OpenSRF WebSockets gateway - - SetHandler websocket-handler - WebSocketHandler /usr/lib/apache2/modules/osrf_websocket_translator.so osrf_websocket_init - diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install index d39cda0..d4b30d0 100644 --- a/src/extras/Makefile.install +++ b/src/extras/Makefile.install @@ -4,7 +4,7 @@ # # Makefile to install prerequisites for OpenSRF # -# Currently supports Debian (jessie/wheezy), Ubuntu (trusty/xenial) +# Currently supports Debian (jessie/stretch), Ubuntu (trusty/xenial) # and Fedora (16). # # Installs Perl prereqs, libjs with Perl wrapper @@ -14,8 +14,6 @@ # - or - # make -f Makefile.install debian-jessie # - or - -# make -f Makefile.install debian-wheezy -# - or - # make -f Makefile.install ubuntu-trusty # - or - # make -f Makefile.install ubuntu-xenial @@ -157,11 +155,6 @@ EXTRA_DEBS = \ libjson-xs-perl \ libnet-server-perl -EXTRA_DEBS_WHEEZY = \ - apache2-mpm-prefork \ - apache2-prefork-dev \ - libncurses5-dev - EXTRA_DEBS_JESSIE = \ apache2-mpm-prefork \ apache2-prefork-dev \ @@ -190,10 +183,8 @@ all: debian-stretch: generic_debian stretch apache_mpm_prefork_mods apache_perl_mod debian-jessie: generic_debian jessie apache_mpm_prefork_mods -debian-wheezy: generic_debian wheezy stretch: install_extra_debs install_extra_debs_stretch debian_sys_config jessie: install_extra_debs_jessie debian_sys_config -wheezy: install_extra_debs_wheezy debian_sys_config generic_debian: install_debs fedora: install_fedora_rpms @@ -225,9 +216,6 @@ install_extra_debs_stretch: install_extra_debs_jessie: install_extra_debs $(APT_TOOL) install $(EXTRA_DEBS_JESSIE) -install_extra_debs_wheezy: install_extra_debs - $(APT_TOOL) install $(EXTRA_DEBS_WHEEZY) - # Install even more packaged dependencies on modern distros install_extra_debs_trusty: $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY) -- 2.43.2