Attachment 6892 Details for Bug 6913 – Bug 6913 - change how ports are handled by koha-create

[patch] Bug 6913 - change how ports are handled by koha-create

Bug-6913---change-how-ports-are-handled-by-koha-cr.patch (text/plain), 1.98 KB, created by Chris Cormack on 2011-12-20 21:06:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2011-12-20 21:06:46 UTC

Size: 1.98 KB

patch

obsolete

>From e9eac3f33ef05354022d64a0317a9335ac82daef Mon Sep 17 00:00:00 2001
>From: Robin Sheat <robin@catalyst.net.nz>
>Date: Mon, 26 Sep 2011 12:04:13 +1300
>Subject: [PATCH] Bug 6913 - change how ports are handled by koha-create
>
>This does two things:
>* Allows OPACPORT to be specified to change the default OPAC port,
>* removes the port number from the ServerName directive, as it's already
>  handled by the VirtualHost declaration.
>
>Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
>Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
>---
> debian/scripts/koha-create |   16 +++++++---------
> 1 files changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
>index ddfa0b0..b52cf90 100755
>--- a/debian/scripts/koha-create
>+++ b/debian/scripts/koha-create
>@@ -30,14 +30,16 @@ die() {
>     exit 1
> }
> 
>+# UPPER CASE VARIABLES - from configfile or default value
>+# lower case variables - generated within this script
> generate_config_file() {
>     touch "$2"
>     chown "root:$username" "$2"
>     chmod 0640 "$2"
>     sed -e "s/__KOHASITE__/$name/g" \
>-        -e "s/__OPACPORT__/80/g" \
>+        -e "s/__OPACPORT__/$OPACPORT/g" \
>         -e "s/__INTRAPORT__/$INTRAPORT/g" \
>-        -e "s/__OPACSERVER__/$domain/g" \
>+        -e "s/__OPACSERVER__/$opacdomain/g" \
>         -e "s/__INTRASERVER__/$intradomain/g" \
>         -e "s/__ZEBRA_PASS__/$zebrapwd/g" \
>         -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \
>@@ -73,6 +75,7 @@ getinstancemysqldatabase() {
> 
> # Set defaults and read config file, if it exists.
> DOMAIN=""
>+OPACPORT="80"
> INTRAPORT="8080"
> INTRAPREFIX=""
> INTRASUFFIX=""
>@@ -145,13 +148,8 @@ fi
> 
> name="$1"
> 
>-domain="$name$DOMAIN"
>-if [ "$INTRAPORT" = 80 ] || [ "$INTRAPORT" = "" ]
>-then
>-    intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN"
>-else
>-    intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN:$INTRAPORT"
>-fi
>+opacdomain="$name$DOMAIN"
>+intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN"
> 
> 
> mysqldb="koha_$name"
>-- 
>1.7.5.4

Actions: View | Diff | Splinter Review

Attachments on bug 6913: 5583 | 5800 | 5803 | 5821 | 6890 | 6892 | 6893