[koha-commits] main Koha release repository branch master updated. v3.16.00-beta-65-g2c5f927

Git repo owner gitmaster at git.koha-community.org
Mon May 19 23:26:27 CEST 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 "main Koha release repository".

The branch, master has been updated
       via  2c5f927689c24323128e88cfa26ffe9adcfbd832 (commit)
       via  624c953b354a21f556ed499726d233dead6aa40f (commit)
       via  92c765307198b0624dcb80b342beedef412cccf7 (commit)
       via  7ec644da06382eb0018a3fad88ef61b35a05e2aa (commit)
      from  9d9c413c42dc124c7ef26c779c2c0758b4735ae4 (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 2c5f927689c24323128e88cfa26ffe9adcfbd832
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Tue May 13 13:39:04 2014 +1200

    Bug 11404: (follow-up) only ask user if there are instances needing upgrading
    
    There's no point asking the user if they want their Apache Koha
    configuration updated if there's no configuration needing updated.
    
    This also fixes a case where the updating would have failed when running
    on Apache 2.4.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    I agree with adding that checks, and the conditions rewrite seems cleaner
    than my first approach. So, I sign it.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 624c953b354a21f556ed499726d233dead6aa40f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Tue May 6 15:13:19 2014 -0300

    Bug 11404: Make the install process aware of the changes
    
    This patch makes the install scripts take care of the new file
    and prompt for user confirmation on the apache file renaming step.
    
    Both prompt and the renaming actions depend on the fact that there
    are instances with their files missing the .conf appendix.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 92c765307198b0624dcb80b342beedef412cccf7
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Mon May 5 11:50:55 2014 -0300

    Bug 11404: koha-functions.sh introduced for reuse
    
    As asked by Robin, a bash lib of functions is introduced with the common
    functions to be reused. Most of the scripts are modified (reduced) to
    include this file and the repeated functions cleaned.
    
    No noticeable change in behaviour should be noticed.
    
    As I've been todl in #debian-mentors, it is used that files for inclusion
    should be installed at the apps directory (i.e. /usr/share/koha/) so this
    patch makes the install script put the file in the bin/ directory.
    
    All koha-* scripts assume the file is there already (and fail otherwise).
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 7ec644da06382eb0018a3fad88ef61b35a05e2aa
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Mon Dec 16 14:32:40 2013 -0300

    Bug 11404: add support for Apache 2.4's config file convention
    
    Apache 2.4 expects the sites definition files use the sufix '.conf'
    
    To reproduce:
    - Install the 'koha-common' package on Debian 7 or Ubuntu 13.10+
      (both known to include Apache 2.4).
    - Create an instance (for example testlibrary) using the supplied
      commands:
     $ koha-create --create-db testlibrary
    > FAIL: apache reports an error like this:
    "ERROR: Site testlibrary does not exist!"
    
    This patch adds a test on the Apache version and appends the ".conf"
    sufix if needed.
    
    To test:
    
    1st step: koha-create gets fixed:
    
    -- The hard way --
    - Apply the patch, and build the koha-common package on top of this
      commit.
    - Install the built package on an Apache 2.4 Debian-based distro (Debian 7
      or Ubuntu 13.10 will work)
    - Create a test instance:
     $ koha-create --create-db testlibrary
    > SUCCESS: no more apache sites related error.
    
    -- The easy way --
    - Apply the patch, and copy the koha-create into an Apache 2.4
      Debian-based distro
    - Create a test instance using the koha-create script you just
      copied:
     $ ./koha-create --create-db testlibrary
    > SUCCESS: no more apache sites related error.
    
    2nd step: the rest of the touched scripts keep working as usual
    
    koha-disable
    koha-dump
    koha-enable
    koha-list
    koha-remove
    koha-restart-zebra
    koha-stop-zebra
    koha-start-zebra
    
    They should all keep working. Can be tested "the easy way" too.
    
    Note: there might be another issues regarding Apache 2.4 deployments
    like the need for
    
     $ a2enmod access_compat
    
    and perhaps some directory permissions tweak, which I think should be
    properly documented on the install instructions.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

-----------------------------------------------------------------------

Summary of changes:
 debian/koha-common.config                         |   16 ++++
 debian/koha-common.install                        |    1 +
 debian/koha-common.postinst                       |   50 ++++++++++
 debian/koha-common.templates                      |    8 ++
 debian/scripts/koha-create                        |   75 +++++++++++----
 debian/scripts/koha-disable                       |   59 ++++--------
 debian/scripts/koha-dump                          |   19 ++--
 debian/scripts/koha-email-disable                 |   39 ++------
 debian/scripts/koha-email-enable                  |   39 ++------
 debian/scripts/koha-enable                        |   48 ++--------
 debian/scripts/{koha-enable => koha-functions.sh} |   90 +++++++++---------
 debian/scripts/koha-list                          |   51 ++--------
 debian/scripts/koha-mysql                         |    9 +-
 debian/scripts/koha-mysqlcheck                    |    9 +-
 debian/scripts/koha-rebuild-zebra                 |   28 ++----
 debian/scripts/koha-remove                        |   17 +++-
 debian/scripts/koha-reset-passwd                  |   11 ++-
 debian/scripts/koha-restart-zebra                 |   57 ++---------
 debian/scripts/koha-restore                       |   11 ++-
 debian/scripts/koha-start-zebra                   |  104 ++++++---------------
 debian/scripts/koha-stop-zebra                    |   92 +++++-------------
 debian/scripts/koha-translate                     |   14 +--
 22 files changed, 340 insertions(+), 507 deletions(-)
 copy debian/scripts/{koha-enable => koha-functions.sh} (50%)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list