Commit graph

125 commits

Author SHA1 Message Date
Robin Sheat
70d95b515e Bug 7532 - remove dependency on Date::ICal
This removes the dependency on Date::ICal (which is largely
unmaintained) and replaces it with DateTime::Format::ICal which can do
the same job. It also updates all the docs and installation scripts to
handle this change.

Note that this causes a minor behaviour change: previously the generated
times were converted to UTC, now they are left "floating" (that is, have
no timezone attached) and so will appear as the local time when imported
into a calendar. I don't anticipate this'll cause any issues however.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-17 11:49:05 +01:00
Robin Sheat
4e8cd9a9dd Bug 7409 - add unzip and perl-doc dependencies to package
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 11:19:39 +01:00
Robin Sheat
831e14e89e Bug 7238 - make packages deal with SIP config
This moves the SIP config to the templates directory (on package
building) in anticipation of making it configurable with package tools.
Prevents it being installed into /etc.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 17:23:08 +01:00
Jared Camins-Esakov
297d22459f Bug 6913: More options for koha-create and koha-remove
This commit makes koha-create more flexible by adding a number of command-line
and configuration options.

The biggest change is to add support for pre-determined MySQL credentials using
a file in /etc/koha/passwd (for security reasons, if you use this feature, make
sure the file is not world-readable). The configuration file has the following
format:
instance:user:password:database
The database is optional, but the other two are both required if you want to
specify MySQL credentials. If no credentials are specified for a given instance,
the standard koha_instance username and an auto-generated password are used.

The following additional command line options are now available:
* --use-db - use a pre-existing database, see also --database
* --database - specify the name of the mysql database (still defaults to
  koha_instance)
* --passwdfile - specify a custom (Koha) passwd file for MySQL credentials

The following additional variables are now available (for use in
koha-sites.conf or a custom config file):
* OPACPORT (previously added but not documented) - port on which the OPAC
  should be served
* OPACPREFIX - prefix for the OPAC's virtual host
* OPACSUFFIX - suffix for the OPAC's virtual host

This commit also adds the --keep-mysql option to koha-remove, which, if
specified, will prevent koha-remove from deleting the database or MySQL user
when removing an instance.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-02-02 09:15:20 +01:00
Robin Sheat
4437737858 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>
2012-02-02 09:15:18 +01:00
Chris Cormack
c1ee7a750f Bug 6836: Adding dependency on Modern::Perl
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-27 11:33:16 +01:00
Robin Sheat
373e49576d Bug 7197 - add a Spanish readme file to the packages
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
2011-12-14 15:38:04 +01:00
Robin Sheat
038a2cf5d6 Bug 7028 - updated the koha-conf.xml template
Now it more closely matches the one that's distributed in /etc

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(not tested. I confirm the code is clean, and tests are not broken)
2011-12-08 17:49:53 +01:00
Jared Camins-Esakov
93cd5bd501 Bug 7216 - koha-restore does not correctly set home
Prior to this patch, the koha-restore Debian script did not set the home
directory properly for the system users it created, causing problems down the
line for koha-rebuild-zebra. This patch fixes that by specifying the home
directory.

http://bugs.koha-community.org/show_bug.cgi?id=7216
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
2011-12-06 17:01:56 +01:00
Robin Sheat
849547df68 Bug 7008 - create tmp dir for zebra
Sometimes zebra needs a tmp dir in order to work. This ensures that it
is created both by koha-create-dirs in the packages, and by
rebuild_zebra when it runs.
--

tested ok, signing off
Signed-off-by: Mason James <mtj@kohaaloha.com>
2011-12-03 07:56:44 +01:00
Jared Camins-Esakov
602c528e91 Bug 6997: Koha-remove leaves system in inconsistent state
If you accidentally delete one of the files that koha-remove is supposed to
remove, when koha-remove reaches that point in the script, it will die, leaving
later removal steps undone. This patch fixes the problem by checking for the
existence of each file prior to deleting it, so that short of an actual problem
with removing the file, the script can continue. Note that the fix for bug 6929
is also needed to prevent any problems with stopping Zebra from killing
koha-remove.

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
2011-12-03 07:53:51 +01:00
Robin Sheat
0fd451060e Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
This brings all the changelog entries for releases up to what has been
included in the packages

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-11-24 11:47:45 +01:00
Robin Sheat
03dffd8374 Bug 7091 - [MASTER] - update the build version for packages from master
This updates the default version number that packages are build with to
be 3.7. This should be applied to master only.

Signed-off-by: Mason James <mtj@kohaaloha.com>
2011-11-24 11:47:04 +01:00
Paul Poulain
5c2def5158 Merge branch 'new/enh/bug_4877' 2011-11-24 10:48:14 +01:00
Magnus Enger
fab2d8b0ab Bug 4877 - Add DocBook for missing manual pages
Add DocBook manual pages for commands that do not have a manual page yet. Also
add a page for koha-common itself, listing all the available commands.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>

Minor change: I fixed a typo I spotted
2011-11-24 10:47:33 +01:00
Robin Sheat
aca414977a Bug 6929 - ensure that koha-stop-zebra will try to stop everything
Currently, if it attempts to stop a zebra process that doesn't exist,
the script will abort, which leaves things running. This patch prevents
it from aborting.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-19 16:26:57 +13:00
Chris Cormack
5e94de9566 Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster 2011-09-23 15:01:21 +12:00
Robin Sheat
ca149ec0bb Bug 4877 - note that the create-db (or related) options are required
Also fix the example so that it is there.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 14:52:13 +12:00
Chris Cormack
147ae6c665 Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster 2011-09-16 13:53:40 +12:00
Robin Sheat
9d3a8d9865 Bug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process
This uses the docbook source files to generate the man pages, and
installs them to their correct location when the packages are being
built.

This will make it easier for people to write man pages, thereby ensuring
that people join in keeping documentation up to date.

Note: adds docbook-xsl and xsltproc to the dependencies.
Note2: applies on top of Magnus' other patch on this ticket.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-16 13:51:26 +12:00
Magnus Enger
95afdc957a Bug 4877 [ENH] Use DocBook for koha-common manual pages
This patch
- deletes debian/scripts/koha-create.8
- adds debian/docs/koha-create.xml and koha-remove.xml

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-16 13:51:02 +12:00
Robin Sheat
ae022e9a22 Bug 6651 - fix splitting of names when updating to 3.4
This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 10:29:12 +12:00
Magnus Enger
b3b6278e20 Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
The revised patch quotes the variable $mysqldb, as suggested by Frère
Sébastien Marie.

This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.

To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-12 10:10:46 +12:00
Robin Sheat
6534b5cf29 Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:22:18 +12:00
Magnus Enger
1c6cdaf162 Bug 4877 [ENH] - Update man page for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(to be followed by another patch that I think helps too)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:21:34 +12:00
Magnus Enger
8d8d2e6b44 Bug 6516 - Make borrowernumber of staff user configurable in koha-create
Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.

Remember to update the wiki if this gets pushed!

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:18:14 +12:00
Robin Sheat
a57b692a60 Bug 6722: [SIGNED-OFF] Cause build output to appear on the screen
This allows the build information to not be suppressed when using
build-git-snapshot. This makes seeing where problems are substantially
easier.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:14:08 +12:00
Chris Cormack
75a4efa704 Merge remote-tracking branch 'kc/new/enh/bug_6540' into kcmaster 2011-08-23 15:52:52 +12:00
Magnus Enger
31bb901e2b Bug 6540 - Followup - koha-create would die without --configfile
koha-create would fail to check that --configfile was set on the
commandline, before either including it if it existed or dying if
it did not. This patch should make sure the existence of a
configfile is only tested if --config is set.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>

This should apply against 3.4 and master.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-23 15:52:15 +12:00
Robin Sheat
73992e2ff4 Bug 6486 - make koha-mysql get installed with the packages
A useful addition I overlooked.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 21:20:57 +12:00
Robin Sheat
7cf4553db1 Bug 6486 - add the koha-mysql command
This lets you get into the mysql session for this library instance
really easily. Probably most useful for developers.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 21:20:52 +12:00
Robin Sheat
85e37cb4b5 Bug 6482 - allow the mysql details to be changed during koha-create
This allows the database details (username and database name in
particular) to be modified in between a koha-create --request-db and
--populate-db. Most useful when you discover that the username is too
long or something. Now, when populating the database, the connection
information is reloaded from the koha-conf.xml rather than being
generated from the instance name.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 21:08:36 +12:00
Robin Sheat
66c3b1507a Bug 6626 - add sudo as a package dependency
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-14 19:47:19 +12:00
Robin Sheat
3e34c65f92 Bug 6275 - allow automated backups for packages
This causes backups for the last two days to be stored by default. The
backups will go into /var/spool/koha.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-11 12:45:53 +12:00
Chris Cormack
7a6a7f0df5 Fix for a typo I made in the build script 2011-08-05 08:46:09 +12:00
Chris Cormack
6991bae259 Fixing a little style edit, so Perl::Critic won't complain 2011-08-04 13:10:19 +12:00
Robin Sheat
8e07fc1099 Bug 5602: Changes to account for the version update.
This is intended to apply on top of the previous 5602 patch.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2011-08-04 10:26:39 +12:00
Srdjan Jankovic
cc819ec93c bug 5602: Rewriting the package making script Now it is a perl script. Various pdebuild flexibility.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2011-08-04 10:26:38 +12:00
Robin Sheat
e7cf2223e0 Bug 6540 - [SIGNED-OFF] fix some command-line args issues
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:19:25 +12:00
Magnus Enger
b66c860d5d Bug 6540 - Add config file as command line option for koha-create
Order of precedence for config options, from lowest to highest:

1. The defaults set in koha-create itself
2. /etc/koha/koha-sites.conf
3. Config file specified with --configfile
4. Individual options set with --marcflavor, --zebralang, --defaultsql

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:18:58 +12:00
Magnus Enger
bddca6fbcf Bug 6540 - Add defaultsql command line option
This will override the setting in /etc/koha/koha-sites.conf.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:18:00 +12:00
Magnus Enger
c7bde29718 Bug 6540 - Followup patch adding command line options
This adds the --marcflavor and --zebralang commandline options, as
well as short versions of all options.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:17:32 +12:00
Magnus Enger
b7b36796f5 Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:17:10 +12:00
John Seymour
fb347c97ac Bug 4873 - Ensure that the required directories exist on init
As systems (Ubuntu already, Debian testing is doing it too) move to
ramdisking /var/run and /var/lock, or otherwise clearing them on boot,
we need to ensure that they're there when we need them. This patch
autocreates any directories that are missing when the init script runs.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:05:58 +12:00
Robin Sheat
c779f2b380 Bug 6361 - make the packages work with koha 3.4
This commit does the following:
* Merge the changelog from the releases of 3.2
* Adds a command 'koha-upgrade-to-3.4' that does the MARC item splitting
  stuff.
* Adds a debconf note to make sure people know that they need to run
  the above command.
* Fixes the inclusion of jQuery in the packages.
* Makes build-git-snapshot build packages with a 3.5 version.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 11:06:31 +12:00
Chris Cormack
ae70c2f790 Bug 6031 : Fix for syntax (bashism crept into a pure sh script)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-02 12:44:48 +12:00
Robin Sheat
dfc1038931 Bug 5509 - use an XML parser to get values from config
Using sed and regex was causing issues when LDAP connection details were
added.

See
http://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
for more information.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-28 13:35:25 +12:00
Chris Cormack
35b338412b Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-10 21:51:26 +12:00
Chris Cormack
bacd210c73 Bug 5917 : Updating dependencies 2011-04-10 21:50:35 +12:00
Srdjan Jankovic
7882911799 bug 6031: play with options passed on to rebuild-zebra.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 20:53:00 +12:00