|
17 | 17 | from pathlib import Path
|
18 | 18 | from urllib import request
|
19 | 19 | from urllib.parse import urljoin
|
| 20 | +from xml.etree import ElementTree |
20 | 21 |
|
21 | 22 |
|
22 | 23 | argsp = None
|
@@ -281,7 +282,7 @@ def __init__(self):
|
281 | 282 |
|
282 | 283 | self.jans_auth_dir = os.path.join(Config.jetty_base, jansAuthInstaller.service_name)
|
283 | 284 | self.jans_auth_custom_lib_dir = os.path.join(self.jans_auth_dir, 'custom/libs')
|
284 |
| - |
| 285 | + self.admin_ui_log_dir = '/var/log/adminui' |
285 | 286 | self.gluu_admin_ui_source_path = os.path.join(Config.dist_jans_dir, 'gluu-admin-ui.zip')
|
286 | 287 | self.log4j2_adminui_path = os.path.join(Config.dist_jans_dir, 'log4j2-adminui.xml')
|
287 | 288 | self.log4j2_path = os.path.join(Config.dist_jans_dir, 'log4j2.xml')
|
@@ -526,8 +527,32 @@ def install_config_api_plugin(self):
|
526 | 527 | config_api_installer.copyFile(self.admin_ui_plugin_source_path, config_api_installer.libDir, backup=False)
|
527 | 528 | config_api_installer.add_extra_class(self.admin_ui_plugin_path)
|
528 | 529 |
|
529 |
| - for logfn in (self.log4j2_adminui_path, self.log4j2_path): |
530 |
| - config_api_installer.copyFile(logfn, config_api_installer.custom_config_dir) |
| 530 | + config_api_installer.copyFile(self.log4j2_path, config_api_installer.custom_config_dir) |
| 531 | + |
| 532 | + log4j2_adminui_path_target_path = os.path.join( |
| 533 | + config_api_installer.custom_config_dir, |
| 534 | + os.path.basename(self.log4j2_adminui_path) |
| 535 | + ) |
| 536 | + |
| 537 | + print("Reading XML", self.log4j2_adminui_path) |
| 538 | + tree = ElementTree.parse(self.log4j2_adminui_path) |
| 539 | + root = tree.getroot() |
| 540 | + |
| 541 | + for appenders in root.findall('Appenders'): |
| 542 | + for child in appenders: |
| 543 | + if child.tag=='RollingFile' and child.get('name') in ('ADMINUI-AUDIT', 'ADMINUI-LOG'): |
| 544 | + for prop in ('fileName', 'filePattern'): |
| 545 | + file_name = child.get(prop) |
| 546 | + if file_name: |
| 547 | + file_base_name = os.path.basename(file_name) |
| 548 | + new_file_path = os.path.join(self.admin_ui_log_dir, file_base_name) |
| 549 | + child.set(prop, new_file_path) |
| 550 | + print("Writing XML", log4j2_adminui_path_target_path) |
| 551 | + tree.write(log4j2_adminui_path_target_path, encoding='utf-8', xml_declaration=True) |
| 552 | + |
| 553 | + if not os.path.exists(self.admin_ui_log_dir): |
| 554 | + os.makedirs(self.admin_ui_log_dir) |
| 555 | + config_api_installer.chown(self.admin_ui_log_dir, Config.jetty_user, Config.jetty_group) |
531 | 556 |
|
532 | 557 | config_api_installer.set_class_path(glob.glob(os.path.join(config_api_installer.libDir, '*.jar')))
|
533 | 558 |
|
|
0 commit comments