From 360cdea29559d84d1f82f0e1e102f18fc8475bb4 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 16 Mar 2016 16:21:32 -0300 Subject: [PATCH] Bug 16084: log4perl.conf not properly set on packages - Run koha-create to create an instance or just fire kohadevbox:ansible => FAIL: Notice the instance's koha-conf.xml points to __KOHA_CONF_DIR__ instead of /etc/koha/sites/kohadev/ on the log4perl entry. => FAIL: the /etc/koha/sites/kohadev/log4perl.conf contains __LOG_DIR__ instead of /var/log/koha/kohadev/ - Apply this patch and pick the koha-conf-site.xml.in and koha-create files - Create a new instance => SUCCESS: All placeholders are filled correctly. - Sign off Regards Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- debian/scripts/koha-create | 4 +++- debian/templates/koha-conf-site.xml.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index a36f7e3167..2a6c87dddd 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -84,7 +84,8 @@ generate_config_file() { touch "$2" chown "root:$username" "$2" chmod 0640 "$2" - sed -e "s/__KOHASITE__/$name/g" \ + sed -e "s/__KOHA_CONF_DIR__/\/etc\/koha\/sites\/$name/g" \ + -e "s/__KOHASITE__/$name/g" \ -e "s/__OPACPORT__/$OPACPORT/g" \ -e "s/__INTRAPORT__/$INTRAPORT/g" \ -e "s/__OPACSERVER__/$opacdomain/g" \ @@ -110,6 +111,7 @@ generate_config_file() { -e "s/__UNIXUSER__/$username/g" \ -e "s/__UNIXGROUP__/$username/g" \ -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \ + -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \ -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \ -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \ -e "s/__MEMCACHED_SERVERS__/$MEMCACHED_SERVERS/g" \ diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index 51a9d86761..fc4ad04390 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -266,7 +266,7 @@ __END_SRU_PUBLICSERVER__ /usr/share/koha/opac/htdocs/opac-tmpl /usr/share/koha/intranet/htdocs/intranet-tmpl /usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/ - /var/log/koha/__KOHASITE__ + __LOG_DIR__ /usr/share/doc/koha-common /var/spool/koha/__KOHASITE__