From 242722e99df77be9ce0e4c6d52ff402e0a77d604 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 23 Sep 2016 11:56:40 -0300 Subject: [PATCH] Bug 17336: Add api_secret_passphrase entry in packages setup Bug 13799 introduced the api_secret_passphrase on source installs, but missed to do so on packages. This patch introduces the entry on the template koha-conf-site.xml.in file, and patches koha-create so it generates a randomized string (64 chars) to put in it. To test: - Apply the patch - Grab the new template file: $ sudo cp kohaclone/debian/templates/koha-conf-site.xml.in \ /etc/koha - Create a new instance: $ kohaclone/debian/scripts/koha-create --create-db blah => SUCCESS: The script runs fine, /etc/koha/sites/blah/koha-conf.xml contains the api_secret_passphrase entry. - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall --- debian/scripts/koha-create | 4 +++- debian/templates/koha-conf-site.xml.in | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 7fba8e63b9..e416c8ccd6 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -105,6 +105,7 @@ generate_config_file() { -e "s/__END_BIBLIOS_RETRIEVAL_INFO__/`echo $END_BIBLIOS_RETRIEVAL_INFO`/g" \ -e "s/__START_AUTHORITIES_RETRIEVAL_INFO__/`echo $START_AUTHORITIES_RETRIEVAL_INFO`/g" \ -e "s/__END_AUTHORITIES_RETRIEVAL_INFO__/`echo $END_AUTHORITIES_RETRIEVAL_INFO`/g" \ + -e "s/__API_SECRET__/$API_SECRET/g" \ -e "s/__DB_NAME__/$mysqldb/g" \ -e "s/__DB_HOST__/$mysqlhost/g" \ -e "s/__DB_USER__/$mysqluser/g" \ @@ -403,7 +404,8 @@ DEFAULT_MEMCACHED_PREFIX="koha_" UPLOAD_PATH_BASE="/var/lib/koha" UPLOAD_DIR="uploads" UPLOAD_PATH="" - +# Generate a randomizaed API secret +API_SECRET="$(pwgen -s 64 1)" # SRU server variables ENABLE_SRU="no" SRU_SERVER_PORT="" diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index 8f7af30863..6bfe004b58 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -292,7 +292,10 @@ __END_SRU_PUBLICSERVER__ __MEMCACHED_SERVERS__ __MEMCACHED_NAMESPACE__ - + + __API_SECRET__ + + /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf -- 2.39.5