From bfd7fc1c9ec665b4affda5bf48c9aca20f8f5775 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 17 Nov 2016 03:41:25 +0100 Subject: Updated log4j.properties. To reduce maintenance the log4j.properties is no longer copied into the instance folder during deployment. Instead, a link will be created in the /var/lib/pki//lib folder pointing to the default file in /usr/share/pki/server/conf. The default log4j.properties has been updated to remove redundant lines. By default only log messages with level WARN or higher will be logged on the console. https://fedorahosted.org/pki/ticket/1897 --- .../python/pki/server/deployment/scriptlets/instance_layout.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index 07eecbdd7..330aa46f7 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -139,8 +139,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): os.path.join( deployer.mdict['pki_instance_lib'], name)) + + # Link /var/lib/pki//lib/log4j.properties + # to /usr/share/pki/server/conf/log4j.properties. deployer.symlink.create( - deployer.mdict['pki_instance_conf_log4j_properties'], + os.path.join(deployer.mdict['pki_source_server_path'], + "log4j.properties"), deployer.mdict['pki_instance_lib_log4j_properties']) # Link /var/lib/pki//common to /usr/share/pki/server/common @@ -231,5 +235,6 @@ def file_ignore_callback_src_server(src, names): 'database.ldif', 'manager.ldif', 'pki.xml', + 'log4j.properties', 'logging.properties' } -- cgit