Merge pull request #104 from personium/develop

Release v2.0.8
personium · Sep 18, 2019 · 460d78c · 460d78c
2 parents 2fb4ca4 + 98d42aa
commit 460d78c
Show file tree

Hide file tree

Showing 31 changed files with 183 additions and 240 deletions.
diff --git a/1-server_unit/Ansible_Settings_Instruction.md b/1-server_unit/Ansible_Settings_Instruction.md
@@ -87,9 +87,9 @@ Below are the files where modification is required.
 ```yaml
   tag_ServerType: web
 
-  nginx_version: 1.14.0
+  nginx_version: 1.14.2
 
-  nginx_hm_version: 0.32
+  nginx_hm_version: 0.33
 ```
 
 #### AP server (file destination : /group_vars/ap.yml)
@@ -116,8 +116,10 @@ Below are the files where modification is required.
   cache_manager: memcached
 
   tomcat_version: 9.0.10
-  
+
   commons_daemon_version : 1.1.0
+
+  activemq_version: 5.15.8
 ```
 
 #### ES server (file destination : /group_vars/es.yml)
@@ -135,7 +137,7 @@ Below are the files where modification is required.
 ```yaml
   tag_ServerType: nfs
 
-  memcached_version: 1.4.21
+  memcached_version: 1.5.12
 
   memcached_lock_maxconn: 256
 
@@ -152,6 +154,8 @@ Below are the files where modification is required.
   memcached_lock_cachesize: 512
 
   memcached_cache_cachesize: 512
+
+  logback_version: 1.2.3
 ```
 
 #### Bastion server (file destination : /group_vars/bastion.yml)

diff --git a/1-server_unit/group_vars/ap.yml b/1-server_unit/group_vars/ap.yml
@@ -19,4 +19,4 @@ cache_manager: memcached
 
 tomcat_version: 9.0.10
 commons_daemon_version : 1.1.0
-activemq_version: 5.15.2
+activemq_version: 5.15.8
diff --git a/1-server_unit/group_vars/nfs.yml b/1-server_unit/group_vars/nfs.yml
@@ -2,7 +2,7 @@
 
 tag_ServerType: nfs
 
-memcached_version: 1.4.21
+memcached_version: 1.5.12
 memcached_lock_maxconn: 256
 memcached_cache_maxconn: 256
 
@@ -15,3 +15,5 @@ cache_port: 11212
 # memcached cachesize
 memcached_lock_cachesize: 512
 memcached_cache_cachesize: 512
+
+logback_version: 1.2.3
diff --git a/1-server_unit/group_vars/web.yml b/1-server_unit/group_vars/web.yml
@@ -2,5 +2,5 @@
 
 tag_ServerType: web
 
-nginx_version: 1.14.0
-nginx_hm_version: 0.32
+nginx_version: 1.14.2
+nginx_hm_version: 0.33
diff --git a/1-server_unit/resource/ap/etc/systemd/system/activemq.service b/1-server_unit/resource/ap/etc/systemd/system/activemq.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=activemq message queue
-After=network.target
+After=network.target elasticsearch.service
 
 [Service]
 PIDFile=/opt/activemq/data/activemq.pid

diff --git a/1-server_unit/resource/ap/etc/systemd/system/tomcat.service b/1-server_unit/resource/ap/etc/systemd/system/tomcat.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Apache Tomcat 8
+Description=Apache Tomcat 9
 After=network.target activemq.service
 
 [Service]
@@ -12,6 +12,7 @@ Environment=JRE_HOME=/opt/jre
 Environment=CATALINA_BASE=/opt/tomcat
 Environment=TOMCAT_USER=personium
 
+ExecStartPre=/bin/sleep 20
 ExecStart=/opt/tomcat/bin/daemon.sh --java-home /opt/jdk --catalina-home /opt/tomcat --catalina-base /opt/tomcat --catalina-pid /opt/tomcat/tomcat.pid --tomcat-user personium start
 ExecStop=/opt/tomcat/bin/daemon.sh --java-home /opt/jdk --catalina-home /opt/tomcat --catalina-base /opt/tomcat --catalina-pid /opt/tomcat/tomcat.pid stop
 [Install]

diff --git a/1-server_unit/resource/bastion/tmp/personium-init-svcmgr.sh.j2 b/1-server_unit/resource/bastion/tmp/personium-init-svcmgr.sh.j2
@@ -49,7 +49,7 @@ function check_response() {
   OPERATION=${2}
   RESPONSE_CODE=`echo "${CURL_RESULT}" | /bin/grep 'status:'`
   if [ "${RESPONSE_CODE}" != "status:${STATUS}" ]; then
-    echo "${OPERATION}faild."
+    echo "${OPERATION} faild."
     exit 2
   fi
 }

diff --git a/1-server_unit/resource/nfs/etc/systemd/system/memcached_cache.service b/1-server_unit/resource/nfs/etc/systemd/system/memcached_cache.service
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/memcached_cache
-ExecStart=/opt/memcached-1.4.21/bin/memcached -u $USER -p $PORT -m $CACHESIZE -c $MAXCONN $OPTIONS
+ExecStart=/opt/memcached-{{ memcached_version }}/bin/memcached -u $USER -p $PORT -m $CACHESIZE -c $MAXCONN $OPTIONS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/1-server_unit/resource/nfs/etc/systemd/system/memcached_lock.service b/1-server_unit/resource/nfs/etc/systemd/system/memcached_lock.service
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/memcached_lock
-ExecStart=/opt/memcached-1.4.21/bin/memcached -u $USER -p $PORT -m $CACHESIZE -c $MAXCONN $OPTIONS
+ExecStart=/opt/memcached-{{ memcached_version }}/bin/memcached -u $USER -p $PORT -m $CACHESIZE -c $MAXCONN $OPTIONS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/1-server_unit/resource/web/opt/nginx/conf/nginx.conf b/1-server_unit/resource/web/opt/nginx/conf/nginx.conf
@@ -39,6 +39,7 @@ http {
 
     log_format combined2    '$remote_addr - $remote_user [$time_local] '
                             '[$http_x_personium_version] '
+                            '[$http_x_personium_requestkey] '
                             '"$request" $status $body_bytes_sent '
                             '"$http_referer" "$http_user_agent" '
                             '"$ssl_cipher" "$ssl_protocol" '

diff --git a/1-server_unit/tasks/nfs/init_logback.yml b/1-server_unit/tasks/nfs/init_logback.yml
@@ -1,10 +1,10 @@
 # Copyright FUJITSU LIMITED 2015-2017.
 
 - name: Download logback
-  command: wget -q -O logback-1.0.3.tar.gz --no-check-certificate http://logback.qos.ch/dist/logback-1.0.3.tar.gz
+  command: wget -q -O logback-{{ logback_version }}.tar.gz --no-check-certificate http://logback.qos.ch/dist/logback-{{ logback_version }}.tar.gz
   args:
     chdir: /usr/local/src
-    creates: /usr/local/src/logback-1.0.3.tar.gz
+    creates: /usr/local/src/logback-{{ logback_version }}.tar.gz
 
 - name: Download slf4j
   command: wget -q -O slf4j-1.6.4.tar.gz --no-check-certificate http://www.slf4j.org/dist/slf4j-1.6.4.tar.gz
@@ -19,19 +19,19 @@
   file: path=/personium/logback/log/logback.log state=touch owner=personium group=personium mode=644
 
 - name: Expand logback
-  command: tar xzf /usr/local/src/logback-1.0.3.tar.gz
+  command: tar xzf /usr/local/src/logback-{{ logback_version }}.tar.gz
   args:
     chdir: /opt/logback
-    creates: /opt/logback/logback-1.0.3
+    creates: /opt/logback/logback-{{ logback_version }}
 
 - name: Expand slf4j
   command: tar xzf /usr/local/src/slf4j-1.6.4.tar.gz
   args:
     chdir: /opt/logback
     creates: /opt/logback/slf4j-1.6.4
 
-- name: Change owner /opt/logback/logback-1.0.3 directory
-  file: state=directory path=/opt/logback/logback-1.0.3 owner=personium group=personium recurse=yes
+- name: Change owner /opt/logback/logback-{{ logback_version }} directory
+  file: state=directory path=/opt/logback/logback-{{ logback_version }} owner=personium group=personium recurse=yes
 
 - name: Change owner /opt/logback/slf4j-1.6.4 directory
   file: state=directory path=/opt/logback/slf4j-1.6.4 owner=personium group=personium recurse=yes

diff --git a/3-server_unit/Ansible_Settings_Instruction.md b/3-server_unit/Ansible_Settings_Instruction.md
@@ -20,104 +20,107 @@ Below are the files where modification is required.
 
     # should be changed to
 
-    ansible_ssh_user=root
+    ansible_ssh_user=ec2-user
 ```
 
 * Modify the hosts file as per instruction below
 
 #### Common Server Setting
 
 ```yaml
+{Bastion_Private_IP}
+# -> Specify the private IP of Bastion server
+# EX: {Bastion_Private_IP}->172.31.10.248
+
+{Web_Private_IP}
+# -> Specify the private IP of Web server
+# EX: {Web_Private_IP}->172.31.10.248
+
+{AP_Private_IP}
+# -> Specify the private IP of  AP server
+# EX: {AP_Private_IP}->172.31.13.38
+
+{ES_Private_IP}
+# -> Set the private IP for ES server
+# EX: {ES_Private_IP}->172.31.3.80
+
+{NFS_Private_IP}
+# -> Set the private IP for NFS server
+# EX: {NFS_Private_IP}->172.31.13.38
+
 {Ansible_Execution_User}
 # -> Specify a user ansible execution
 # EX: {Ansible_Execution_User}->root
 
 {SSH_PrivateKey}
 # -> Set the secret key in the absolute path for  ansible user ssh public key authentication
 # EX: {SSH_PrivateKey}->/root/.ssh/id_rsa
-```
 
-#### Bastion server
-
-```yaml
-{Bastion_Private_IP}
-# -> Specify the private IP of Bastion server
-# EX: {Bastion_Private_IP}->172.31.10.248
+{Web_Global_IP}
+# -> Specify the global IP for Web server
+# EX: {Web_Global_IP}->54.65.33.203
 
-{Bastion_Tag_Name}
-# -> Specify the host name for Bastion server
-# EX: {Bastion_Tag_Name}->bastion-web
+{Web_FQDN}
+# -> Specify the FQDN for Web server(same as unit FQDN)
+# EX: {Web_FQDN}->ec2-54-65-33-203.ap-northeast-1.compute.amazonaws.com
 
 {Bastion_Network_Separation}
 # -> Specify the network catagory for Bastion server
 # EX: {Bastion_Network_Separation}->172.31.10.0/24
 
+{WEB_Network_Separation}
+# -> Specify the network catagory for WEB server
+# EX: {WEB_Network_Separation}->172.31.10.0/24
+
+{AP_Network_Separation}
+# -> Specify the network catagory for AP server
+# EX: {AP_Network_Separation}->172.31.13.0/24
+
+{Master_Token}
+# -> To authorize all kind of operation, set the master token (Strictly managed)
+# EX: enable_mastertoken=true
+#     {Master_Token}->abc123
+
 {Path_Based_Cell_Url_Enabled}
 # -> URL format to access cell*1
 # -> true:path based cell url
 # -> false:per cell fqdn url
 # EX: {Path_Based_Cell_Url_Enabled}->false
 ```
+
 *1.For explanation about URL format to access cell, please confirm [here](https://personium.io/docs/ja/server-operator/setup_percell.html).
 
-#### Web server
+#### Bastion server
 
 ```yaml
-{Web_Private_IP}
-# -> Specify the private IP of Web server
-# EX: {Web_Private_IP}->172.31.10.248
+{Bastion_Tag_Name}
+# -> Specify the host name for Bastion server
+# EX: {Bastion_Tag_Name}->bastion-web
+```
+
+#### Web server
 
+```yaml
 {Web_Tag_Name}
 # -> Specify the host name for Web server
 # EX: {Web_Tag_Name}->bastion-web
-
-{Web_Global_IP}
-# -> Specify the global IP for Web server
-# EX: {Web_Global_IP}->54.65.33.203
-
-{Web_FQDN}
-# -> Specify the FQDN for Web server(same as unit FQDN)
-# EX: {Web_FQDN}->ec2-54-65-33-203.ap-northeast-1.compute.amazonaws.com
 ```
 
 #### AP server
 
 ```yaml
-{AP_Private_IP}
-# -> Specify the private IP of  AP server
-# EX: {AP_Private_IP}->172.31.13.38
-
-{AP_Network_Separation}
-# -> Specify the network catagory for AP server
-# EX: {AP_Network_Separation}->172.31.13.0/24
-
 {AP_Tag_Name}
 # -> Specify the host name for AP server
 # EX: {AP_Tag_Name}->test-ap
 
 {PIO_LOGVOL}
 # -> Specify the disk name for Personium log
 # EX: {PIO_LOGVOL}->vdb
-
-{Master_Token}
-# -> To authorize all kind of operation, set the master token (Strictly managed)
-# EX: {Master_Token}->abc123
-
-{Path_Based_Cell_Url_Enabled}
-# -> URL format to access cell*1
-# -> true:path based cell url
-# -> false:per cell fqdn url
-# EX: {Path_Based_Cell_Url_Enabled}->false
 ```
-*1.For explanation about URL format to access cell, please confirm [here](https://personium.io/docs/ja/server-operator/setup_percell.html).
 
 #### ES server
 
 ```yaml
-{ES_Private_IP}
-# -> Set the private IP for ES server
-# EX: {ES_Private_IP}->172.31.3.80
-
 {ES_Tag_Name}
 # -> Specify the host name for ES server
 # EX: {ES_Tag_Name}->test-ES
@@ -130,10 +133,6 @@ Below are the files where modification is required.
 #### NFS server
 
 ```yaml
-{NFS_Private_IP}
-# -> Set the private IP for NFS server
-# EX: {NFS_Private_IP}->172.31.13.38
-
 {nfs_Tag_Name}
 # -> Specify the host name for nfs server
 # EX: {nfs_Tag_Name}->test-NFS
@@ -154,9 +153,9 @@ Below are the files where modification is required.
 ```yaml
   tag_ServerType: web
 
-  nginx_version: 1.14.0
+  nginx_version: 1.14.2
 
-  nginx_hm_version: 0.32
+  nginx_hm_version: 0.33
 ```
 
 #### AP server (file destination : /group_vars/ap.yml)
@@ -185,6 +184,8 @@ Below are the files where modification is required.
   tomcat_version: 9.0.10
 
   commons_daemon_version : 1.1.0
+
+  activemq_version: 5.15.8
 ```
 
 #### ES server (file destination : /group_vars/es.yml)
@@ -202,7 +203,7 @@ Below are the files where modification is required.
 ```yaml
   tag_ServerType: nfs
 
-  memcached_version: 1.4.21
+  memcached_version: 1.5.12
 
   memcached_lock_maxconn: 1024
 
@@ -219,6 +220,8 @@ Below are the files where modification is required.
   memcached_lock_cachesize: 512
 
   memcached_cache_cachesize: 512
+
+  logback_version: 1.2.3
 ```
 
 #### bastion server (file destination : /group_vars/bastion.yml)

diff --git a/3-server_unit/bastion.yml b/3-server_unit/bastion.yml
@@ -9,3 +9,5 @@
 - include: ./tasks/bastion/mvn_package.yml
   vars:
     build_mod: engine
+- include: ./tasks/bastion/init_personium_regression.yml
+
diff --git a/3-server_unit/group_vars/ap.yml b/3-server_unit/group_vars/ap.yml
@@ -19,4 +19,4 @@ cache_manager: memcached
 
 tomcat_version: 9.0.10
 commons_daemon_version : 1.1.0
-activemq_version: 5.15.2
+activemq_version: 5.15.8
diff --git a/3-server_unit/group_vars/nfs.yml b/3-server_unit/group_vars/nfs.yml
@@ -2,7 +2,7 @@
 
 tag_ServerType: nfs
 
-memcached_version: 1.4.21
+memcached_version: 1.5.12
 memcached_lock_maxconn: 1024
 memcached_cache_maxconn: 1024
 
@@ -15,3 +15,5 @@ cache_port: 11212
 # memcached cachesize
 memcached_lock_cachesize: 512
 memcached_cache_cachesize: 512
+
+logback_version: 1.2.3