From 55f2c70e52ca5c3ad122e04e8fa25a329d6b0148 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Wed, 28 Sep 2016 11:58:42 +0200
Subject: [PATCH] library/roles/gcube/authorization_service: Fix some
 properties. Manage the logs configuration installing a logback template.
 d4science-ghn-cluster: Fix the authorization nginx virtualhost template.
 d4science-ghn-cluster/group_vars/authorization_service: group hierarchy
 authorization_service -> (authorization_service_dev
 authorization_service_prod)

---
 gcube/authorization_service/defaults/main.yml |  5 ++++
 gcube/authorization_service/handlers/main.yml | 11 +++++++++
 gcube/authorization_service/tasks/main.yml    | 16 +++++++++----
 .../templates/logback.xml.j2                  | 24 +++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 gcube/authorization_service/handlers/main.yml
 create mode 100644 gcube/authorization_service/templates/logback.xml.j2

diff --git a/gcube/authorization_service/defaults/main.yml b/gcube/authorization_service/defaults/main.yml
index e098f0dd..bc57f1df 100644
--- a/gcube/authorization_service/defaults/main.yml
+++ b/gcube/authorization_service/defaults/main.yml
@@ -1,10 +1,15 @@
 ---
 authorization_service_install: False
+authorization_service_upgrade: False
 authorization_service_name: authorization-service  
 authorization_service_file: '{{ authorization_service_name }}-2.0.0-20160927.120833-1.war'
 authorization_service_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots/org/gcube/common/authorization-service/2.0.0-SNAPSHOT/{{ authorization_service_file }}'
 authorization_service_persistence_dest: WEB-INF/classes/META-INF/persistence.xml
 authorization_service_config_dest: WEB-INF/AuthorizationConfiguration.xml
+auth_user: '{{ d4science_user }}'
+authorization_service_loglevel: INFO
+authorization_service_root_loglevel: WARN
+authorization_service_http_port: 8080
 authorized_ips:
   - 127.0.0.1
 
diff --git a/gcube/authorization_service/handlers/main.yml b/gcube/authorization_service/handlers/main.yml
new file mode 100644
index 00000000..6a7cdff6
--- /dev/null
+++ b/gcube/authorization_service/handlers/main.yml
@@ -0,0 +1,11 @@
+---
+- name: Restart the authorization service
+  service: name='tomcat-instance-{{ authorization_service_http_port }}' state=restarted
+  when: authorization_service_install
+
+- name: Stop the authorization service
+  service: name='tomcat-instance-{{ authorization_service_http_port }}' state=stopped
+
+- name: Start the authorization service
+  service: name='tomcat-instance-{{ authorization_service_http_port }}' state=started
+  when: authorization_service_install
diff --git a/gcube/authorization_service/tasks/main.yml b/gcube/authorization_service/tasks/main.yml
index 47c350ed..5c332072 100644
--- a/gcube/authorization_service/tasks/main.yml
+++ b/gcube/authorization_service/tasks/main.yml
@@ -1,11 +1,15 @@
 ---
 - block:
+    - name: Stop the service when upgrading
+      service: name='tomcat-instance-{{ authorization_http_port }}' state=stopped      
+      when: authorization_service_upgrade
+
     - name: Remove the installed authorization service before upgrading
       file: dest={{ item }} state=absent
       with_items:
         - '{{ auth_instance_path }}/webapps/authorization-service'
         - '{{ auth_instance_path }}/webapps/authorization-service.war'
-      when: authorization_upgrade or not authorization_service_install
+      when: authorization_service_upgrade or not authorization_service_install
 
     - name: Get the authorization service war file
       get_url: url={{ authorization_service_url }} dest={{ auth_instance_path }}/webapps/{{ authorization_service_file }}
@@ -17,13 +21,15 @@
 
     - name: Install the authorization service AuthorizationConfiguration.xml template
       template: src=AuthorizationConfiguration.xml.j2 dest={{ auth_instance_path }}/webapps/authorization-service/{{ authorization_service_config_dest }} mode=0440
-      with_items: '{{ tomcat_m_instances }}'
-      notify: tomcat instances restart
+      notify: Restart the authorization service
 
     - name: Install the authorization service persistence.xml template
       template: src=persistence.xml.j2 dest={{ auth_instance_path }}/webapps/authorization-service/{{ authorization_service_persistence_dest }} mode=0440
-      with_items: '{{ tomcat_m_instances }}'
-      notify: tomcat instances restart
+      notify: Restart the authorization service
+
+    - name: Install the logback configuration
+      template: src=logback.xml.j2 dest={{ auth_instance_path }}/lib/logback.xml mode=0644
+      notify: Restart the authorization service
 
   become: True
   become_user: '{{ auth_user }}'
diff --git a/gcube/authorization_service/templates/logback.xml.j2 b/gcube/authorization_service/templates/logback.xml.j2
new file mode 100644
index 00000000..c405cf2b
--- /dev/null
+++ b/gcube/authorization_service/templates/logback.xml.j2
@@ -0,0 +1,24 @@
+
+<configuration>
+
+	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${catalina.base}/logs/ghn.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${catalina.base}/logs/ghn.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+	</appender>
+
+	<logger name="org.gcube" level="{{ authorization_service_loglevel }}" />
+	<logger name="org.gcube.common.authorizationservice" level="{{ authorization_service_loglevel }}" />
+	<logger name="org.gcube.common" level="{{ authorization_service_loglevel }}" />
+	
+	<root level="{{ authorization_service_root_loglevel }}">
+		<appender-ref ref="FILE" />
+	</root>
+</configuration>