changing the name of the zebra password file to passwd

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/Makefile.PL b/Makefile.PL
index af2a46c..b26f35f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -163,7 +163,7 @@ WriteMakefile(
       'rewrite-config.PL' => [
          '$(PREFIX)/share/koha/etc/koha-conf.xml',
          '$(PREFIX)/share/koha/etc/koha-httpd.conf',
-         '$(PREFIX)/share/koha/etc/zebradb/tab/kohalis',
+         '$(PREFIX)/share/koha/etc/zebradb/tab/passwd',
          '$(PREFIX)/share/koha/etc/zebradb/zebra-biblios.cfg',
          '$(PREFIX)/share/koha/etc/zebradb/zebra-authorities.cfg'
          ]

diff --git a/etc/zebradb/tab/kohalis b/etc/zebradb/tab/kohalis
deleted file mode 100644 (file)
index a65eab4..0000000
--- a/etc/zebradb/tab/kohalis
+++ /dev/null
@@ -1 +0,0 @@
-__ZEBRA_USER__:__ZEBRA_PASS__

diff --git a/etc/zebradb/tab/passwd b/etc/zebradb/tab/passwd
new file mode 100644 (file)
index 0000000..a65eab4
--- /dev/null
+++ b/etc/zebradb/tab/passwd
@@ -0,0 +1 @@
+__ZEBRA_USER__:__ZEBRA_PASS__

diff --git a/etc/zebradb/zebra-authorities.cfg b/etc/zebradb/zebra-authorities.cfg
index a63293e..c0ae91e 100644 (file)
--- a/etc/zebradb/zebra-authorities.cfg
+++ b/etc/zebradb/zebra-authorities.cfg
@@ -29,7 +29,7 @@ storeData:1
 lockDir: __BASE_DIR__/zebradb/authorities/lock
 perm.anonymous:r
 perm.kohaadmin:rw
-passw.kohalis
+passw.passwd
 shadow
 register: __BASE_DIR__/zebradb/authorities/register:4G
 shadow: __BASE_DIR__/zebradb/authorities/shadow:1G 

diff --git a/etc/zebradb/zebra-biblios.cfg b/etc/zebradb/zebra-biblios.cfg
index 9d93aca..5e44051 100644 (file)
--- a/etc/zebradb/zebra-biblios.cfg
+++ b/etc/zebradb/zebra-biblios.cfg
@@ -26,7 +26,7 @@ storeData:1
 lockDir: __BASE_DIR__/zebradb/biblios/lock
 perm.anonymous:r
 perm.kohaadmin:rw
-passw.kohalis
+passw.passwd
 shadow
 register: __BASE_DIR__/zebradb/biblios/register:4G
 shadow: __BASE_DIR__/zebradb/biblios/shadow:4G

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index b9b7946..1bc8259 100755 (executable)
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -245,7 +245,7 @@ storeData:1
 lockDir: $authorityserverdir/lock
 perm.anonymous:r
 perm.kohaadmin:rw
-passw.kohalis
+passw.passwd
 shadow
 register: $authorityserverdir/register:4G
 shadow: $authorityserverdir/shadow:4G
@@ -447,7 +447,7 @@ storeData:1
 lockDir: $biblioserverdir/lock
 perm.anonymous:r
 perm.kohaadmin:rw
-passw.kohalis
+passw.passwd
 shadow
 register: $biblioserverdir/register:4G
 shadow: $biblioserverdir/shadow:4G