Enable SCC access logging if scc_access_logging variable is set

modules/server/main.tf

@@ -66,6 +66,7 @@ module "server" {
     java_salt_debugging            = var.java_salt_debugging
     skip_changelog_import          = var.skip_changelog_import
     create_first_user              = var.create_first_user
+    scc_access_logging             = var.scc_access_logging
     mgr_sync_autologin             = var.mgr_sync_autologin
     create_sample_channel          = var.create_sample_channel
     create_sample_activation_key   = var.create_sample_activation_key

modules/server/variables.tf

@@ -207,6 +207,11 @@ variable "traceback_email" {
   default     = null
 }
 
+variable "scc_access_logging" {
+  description = "enable logging for SCC access through taskomatic and tomcat"
+  default     = true
+}
+
 variable "swap_file_size" {
   description = "Swap file size in MiB, or 0 for none"
   default     = 0

modules/server_containerized/main.tf

@@ -57,6 +57,7 @@ module "server_containerized" {
     database_disk_size             = var.database_disk_size
     skip_changelog_import          = var.skip_changelog_import
     create_first_user              = var.create_first_user
+    scc_access_logging             = var.scc_access_logging
     mgr_sync_autologin             = var.mgr_sync_autologin
     create_sample_channel          = var.create_sample_channel
     create_sample_activation_key   = var.create_sample_activation_key

modules/server_containerized/variables.tf

@@ -192,6 +192,11 @@ variable "traceback_email" {
   default     = null
 }
 
+variable "scc_access_logging" {
+  description = "enable logging for SCC access through taskomatic and tomcat"
+  default     = true
+}
+
 variable "smt" {
   description = "URL to an SMT server to get packages from"
   default     = null

salt/server/taskomatic.sls

@@ -1,5 +1,6 @@
-{% if grains.get('java_debugging') or grains.get('java_hibernate_debugging') %}
 include:
+  - server
+{% if grains.get('java_debugging') or grains.get('java_hibernate_debugging') %}
   - server.rhn
 {% endif %}
 
@@ -33,6 +34,17 @@ taskomatic_hibernate_debug_log:
       - sls: server.rhn
 {% endif %}
 
+{% if grains.get('scc_access_logging') %}
+taskomatic_scc_access_logging:
+  file.line:
+    - name: /usr/share/rhn/classes/log4j2.xml
+    - content: '        <Logger name="com.suse.scc.client.SCCWebClient" level="info" />'
+    - after: "<Loggers>"
+    - mode: ensure
+    - require:
+      - sls: server
+{% endif %}
+
 taskomatic:
   service.running:
     - watch:

salt/server/tomcat.sls

@@ -1,5 +1,6 @@
-{% if grains.get('java_debugging') or grains.get('java_salt_debugging') %}
 include:
+  - server
+{% if grains.get('java_debugging') or grains.get('java_salt_debugging') %}
   - server.rhn
 {% endif %}
 
@@ -32,6 +33,21 @@ salt_server_action_service_debug_log:
       - sls: server.rhn
 {% endif %}
 
+{% if grains.get('scc_access_logging') %}
+  {% set tomcat_log4j2_xml_path = "/usr/share/susemanager/www/tomcat/webapps/rhn/WEB-INF/classes/log4j2.xml" %}
+  {% if __salt__["file.exists"]("/srv/tomcat/webapps/rhn/WEB-INF/classes/log4j2.xml") %}
+    set tomcat_log4j2_xml_path = "/srv/tomcat/webapps/rhn/WEB-INF/classes/log4j2.xml"
+  {% endif %}
+tomcat_scc_access_logging:
+  file.line:
+    - name: {{tomcat_log4j2_xml_path}}
+    - content: '        <Logger name="com.suse.scc.client.SCCWebClient" level="info" />'
+    - after: "<Loggers>"
+    - mode: ensure
+    - require:
+      - sls: server
+{% endif %}
+
 {% if grains.get('login_timeout') %}
 extend_tomcat_login_timeout:
   file.replace:

salt/server_containerized/init.sls

@@ -7,3 +7,7 @@ include:
   - server_containerized.initial_content
   - server_containerized.testsuite
   - server_containerized.large_deployment
+  {% if grains.get('scc_access_logging') %}
+  - server_containerized.taskomatic
+  - server_containerized.tomcat
+  {% endif %}

salt/server_containerized/taskomatic.sls

@@ -0,0 +1,11 @@
+include:
+  - server_containerized
+
+taskomatic_scc_access_logging:
+  file.line:
+    - name: /usr/share/rhn/classes/log4j2.xml
+    - content: '        <Logger name="com.suse.scc.client.SCCWebClient" level="info" />'
+    - after: "<Loggers>"
+    - mode: ensure
+    - require:
+      - sls: server_containerized

salt/server_containerized/tomcat.sls

@@ -0,0 +1,11 @@
+include:
+  - server_containerized
+
+tomcat_scc_access_logging:
+  file.line:
+    - name: /usr/share/susemanager/www/tomcat/webapps/rhn/WEB-INF/classes/log4j2.xml
+    - content: '        <Logger name="com.suse.scc.client.SCCWebClient" level="info" />'
+    - after: "<Loggers>"
+    - mode: ensure
+    - require:
+      - sls: server_containerized