diff --git a/Makefile.PL b/Makefile.PL index 8687dde580..5438aeece4 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -232,16 +232,6 @@ my $target_map = { './edithelp.pl' => 'INTRANET_CGI_DIR', './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, './etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 }, - './etc/zebradb/authorities/lock' => { target => 'ZEBRA_LOCK_DIR', trimdir => 3 }, - './etc/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/authorities/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/authorities/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/authorities/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/biblios/lock' => { target => 'ZEBRA_LOCK_DIR', trimdir => 3 }, - './etc/zebradb/biblios/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/biblios/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/biblios/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, - './etc/zebradb/biblios/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 3 }, './help.pl' => 'NONE', # FIXME './installer-CPAN.pl' => 'NONE', './installer' => 'INTRANET_CGI_DIR', @@ -268,6 +258,18 @@ my $target_map = { './reviews' => 'INTRANET_CGI_DIR', './rss' => 'NONE', # FIXME deal with a little later './serials' => 'INTRANET_CGI_DIR', + './skel' => 'NONE', + './skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 }, + './skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/authorities/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/authorities/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/authorities/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lock/koha/zebradb/biblios' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/biblios/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/biblios/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/biblios/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, + './skel/var/lib/koha/zebradb/biblios/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, './sms' => 'INTRANET_CGI_DIR', './suggestion' => 'INTRANET_CGI_DIR', './svc' => 'INTRANET_CGI_DIR', diff --git a/etc/zebradb/authorities/key/README b/etc/zebradb/authorities/key/README deleted file mode 100644 index 13dbbf66f9..0000000000 --- a/etc/zebradb/authorities/key/README +++ /dev/null @@ -1 +0,0 @@ -Zebra key dir diff --git a/etc/zebradb/authorities/lock/README b/etc/zebradb/authorities/lock/README deleted file mode 100644 index 1ffee6bceb..0000000000 --- a/etc/zebradb/authorities/lock/README +++ /dev/null @@ -1 +0,0 @@ -Zebra lock dir diff --git a/etc/zebradb/authorities/register/README b/etc/zebradb/authorities/register/README deleted file mode 100644 index 82c9db0107..0000000000 --- a/etc/zebradb/authorities/register/README +++ /dev/null @@ -1 +0,0 @@ -Zebra register dir diff --git a/etc/zebradb/authorities/shadow/README b/etc/zebradb/authorities/shadow/README deleted file mode 100644 index 6f5f64c0e0..0000000000 --- a/etc/zebradb/authorities/shadow/README +++ /dev/null @@ -1 +0,0 @@ -Zebra shadow dir diff --git a/etc/zebradb/authorities/tmp/README b/etc/zebradb/authorities/tmp/README deleted file mode 100644 index 12e036144e..0000000000 --- a/etc/zebradb/authorities/tmp/README +++ /dev/null @@ -1 +0,0 @@ -Zebra tmp dir diff --git a/etc/zebradb/biblios/key/README b/etc/zebradb/biblios/key/README deleted file mode 100644 index 87451707c4..0000000000 --- a/etc/zebradb/biblios/key/README +++ /dev/null @@ -1 +0,0 @@ -Zebra key dir diff --git a/etc/zebradb/biblios/lock/README b/etc/zebradb/biblios/lock/README deleted file mode 100644 index 1ffee6bceb..0000000000 --- a/etc/zebradb/biblios/lock/README +++ /dev/null @@ -1 +0,0 @@ -Zebra lock dir diff --git a/etc/zebradb/biblios/register/README b/etc/zebradb/biblios/register/README deleted file mode 100644 index 39a48578fb..0000000000 --- a/etc/zebradb/biblios/register/README +++ /dev/null @@ -1 +0,0 @@ -Zebra readme dir diff --git a/etc/zebradb/biblios/tmp/README b/etc/zebradb/biblios/tmp/README deleted file mode 100644 index 12e036144e..0000000000 --- a/etc/zebradb/biblios/tmp/README +++ /dev/null @@ -1 +0,0 @@ -Zebra tmp dir diff --git a/skel/README b/skel/README new file mode 100644 index 0000000000..6d9b54ba85 --- /dev/null +++ b/skel/README @@ -0,0 +1,6 @@ +The skel directory contains placeholders +for directories needed by the Zebra +installation, and is used only by the installer. + +No files except for README placeholders +used by make should be kept in this tree. diff --git a/skel/var/lib/koha/zebradb/authorities/key/README b/skel/var/lib/koha/zebradb/authorities/key/README new file mode 100644 index 0000000000..e03e5098c2 --- /dev/null +++ b/skel/var/lib/koha/zebradb/authorities/key/README @@ -0,0 +1 @@ +Zebra authorities key dir diff --git a/skel/var/lib/koha/zebradb/authorities/register/README b/skel/var/lib/koha/zebradb/authorities/register/README new file mode 100644 index 0000000000..b93dac8eed --- /dev/null +++ b/skel/var/lib/koha/zebradb/authorities/register/README @@ -0,0 +1 @@ +Zebra authorities register dir diff --git a/skel/var/lib/koha/zebradb/authorities/shadow/README b/skel/var/lib/koha/zebradb/authorities/shadow/README new file mode 100644 index 0000000000..5286b79b5c --- /dev/null +++ b/skel/var/lib/koha/zebradb/authorities/shadow/README @@ -0,0 +1 @@ +Zebra authorities shadow dir diff --git a/skel/var/lib/koha/zebradb/authorities/tmp/README b/skel/var/lib/koha/zebradb/authorities/tmp/README new file mode 100644 index 0000000000..a0b0e2d1a9 --- /dev/null +++ b/skel/var/lib/koha/zebradb/authorities/tmp/README @@ -0,0 +1 @@ +Zebra authorities tmp dir diff --git a/skel/var/lib/koha/zebradb/biblios/key/README b/skel/var/lib/koha/zebradb/biblios/key/README new file mode 100644 index 0000000000..2829ae0f24 --- /dev/null +++ b/skel/var/lib/koha/zebradb/biblios/key/README @@ -0,0 +1 @@ +Zebra biblios key dir diff --git a/skel/var/lib/koha/zebradb/biblios/register/README b/skel/var/lib/koha/zebradb/biblios/register/README new file mode 100644 index 0000000000..678109abd7 --- /dev/null +++ b/skel/var/lib/koha/zebradb/biblios/register/README @@ -0,0 +1 @@ +Zebra biblios register dir diff --git a/skel/var/lib/koha/zebradb/biblios/shadow/README b/skel/var/lib/koha/zebradb/biblios/shadow/README new file mode 100644 index 0000000000..6898112412 --- /dev/null +++ b/skel/var/lib/koha/zebradb/biblios/shadow/README @@ -0,0 +1 @@ +Zebra biblios shadow dir diff --git a/skel/var/lib/koha/zebradb/biblios/tmp/README b/skel/var/lib/koha/zebradb/biblios/tmp/README new file mode 100644 index 0000000000..eb282b1264 --- /dev/null +++ b/skel/var/lib/koha/zebradb/biblios/tmp/README @@ -0,0 +1 @@ +Zebra biblios tmp dir diff --git a/skel/var/lock/koha/zebradb/authorities/README b/skel/var/lock/koha/zebradb/authorities/README new file mode 100644 index 0000000000..ef9cad1e43 --- /dev/null +++ b/skel/var/lock/koha/zebradb/authorities/README @@ -0,0 +1 @@ +Zebra authorities lock dir diff --git a/skel/var/lock/koha/zebradb/biblios/README b/skel/var/lock/koha/zebradb/biblios/README new file mode 100644 index 0000000000..22ac627241 --- /dev/null +++ b/skel/var/lock/koha/zebradb/biblios/README @@ -0,0 +1 @@ +Zebra biblios lock dir diff --git a/skel/var/run/koha/zebradb/README b/skel/var/run/koha/zebradb/README new file mode 100644 index 0000000000..1582989fea --- /dev/null +++ b/skel/var/run/koha/zebradb/README @@ -0,0 +1 @@ +Zebra Unix-domain sockets