From deb9afe68996513348038fd44cc082f146e7d0de Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 6 Oct 2022 16:49:09 +0900 Subject: [PATCH 01/16] remove useless diff --- 3-tier/Ansible_Settings_Instruction.md | 4 ++-- 3-tier/group_vars/es.yml | 2 -- 3-tier/resource/ap/opt/logback/logback.xml | 3 +-- 3-tier/resource/web/opt/nginx/conf/nginx.conf | 8 ++++---- 3-tier/tasks/nfs/init_memcached_env_os.yml | 9 ++++----- all-in-one/group_vars/nfs.yml | 2 +- .../resource/bastion/tmp/personium-init-svcmgr.sh.j2 | 2 +- all-in-one/tasks/es/init_service_elasticsearch.yml | 2 +- all-in-one/tasks/web/init_nginx_install.yml | 1 - 9 files changed, 14 insertions(+), 19 deletions(-) diff --git a/3-tier/Ansible_Settings_Instruction.md b/3-tier/Ansible_Settings_Instruction.md index 002fbac..5006e97 100644 --- a/3-tier/Ansible_Settings_Instruction.md +++ b/3-tier/Ansible_Settings_Instruction.md @@ -16,11 +16,11 @@ Below are the files where modification is required. * Example ```yaml - ansible_ssh_user={Ansible_Execution_User} + master_token={Master_Token} # should be changed to - ansible_ssh_user=ec2-user + master_token=abc123 ``` * Modify the hosts file as per instruction below diff --git a/3-tier/group_vars/es.yml b/3-tier/group_vars/es.yml index 236ad6e..2615728 100644 --- a/3-tier/group_vars/es.yml +++ b/3-tier/group_vars/es.yml @@ -7,5 +7,3 @@ version: 6.6.1 # elasticsearch heapsize es_heapsize: 3328 - - diff --git a/3-tier/resource/ap/opt/logback/logback.xml b/3-tier/resource/ap/opt/logback/logback.xml index bae186c..2c5d5de 100644 --- a/3-tier/resource/ap/opt/logback/logback.xml +++ b/3-tier/resource/ap/opt/logback/logback.xml @@ -24,8 +24,7 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-5level] %logger{0} %msg%n - + /personium/personium-core/log/personium-user.log diff --git a/3-tier/resource/web/opt/nginx/conf/nginx.conf b/3-tier/resource/web/opt/nginx/conf/nginx.conf index 713baf2..3ef5d34 100644 --- a/3-tier/resource/web/opt/nginx/conf/nginx.conf +++ b/3-tier/resource/web/opt/nginx/conf/nginx.conf @@ -79,10 +79,10 @@ http { } location / { - # If a character that can not be used as a URL is passed, it will return a response code 400 - # Characters that can not be used as URLs conform to RFC 2396 - # For characters not defined in RFC within the range of ASCII code - # Double-byte characters and multibyte characters are excluded from checking + # If a character that can not be used as a URL is passed, it will return a response code 400 + # Characters that can not be used as URLs conform to RFC 2396 + # For characters not defined in RFC within the range of ASCII code + # Double-byte characters and multibyte characters are excluded from checking if ($request_uri ~ [\x00-\x20\x22\x3c\x3e\x5b-\x5e\x60\x7b-\x7d\x7f]) { return 400; } diff --git a/3-tier/tasks/nfs/init_memcached_env_os.yml b/3-tier/tasks/nfs/init_memcached_env_os.yml index 0da985b..d7d082f 100644 --- a/3-tier/tasks/nfs/init_memcached_env_os.yml +++ b/3-tier/tasks/nfs/init_memcached_env_os.yml @@ -1,4 +1,4 @@ -# Copyright FUJITSU LIMITED 2015. +# Copyright FUJITSU LIMITED 2015-2017. - name: Create group group: name=memcached gid=2040 state=present @@ -6,10 +6,10 @@ - name: Create user user: name=memcached uid=2040 shell=/sbin/nologin group=memcached home=/opt/var/lib/memcached comment="Memcached Administrator" createhome=no -- name: Create /opt/var/lib +- name: Create /opt/var/lib directory file: "state=directory path=/opt/var/lib owner=root group=root" -- name: Create Home directory +- name: Create home directory file: "state=directory path=/opt/var/lib/memcached owner=memcached group=memcached recurse=yes" - name: Create /personium/memcached directory @@ -18,6 +18,5 @@ - name: Create /personium/memcached/log directory file: state=directory path=/personium/memcached/log owner=memcached group=memcached mode=0755 -- name: Create /var/run/memcached +- name: Create /var/run/memcached directory file: state=directory path=/var/run/memcached owner=memcached group=memcached mode=0755 - diff --git a/all-in-one/group_vars/nfs.yml b/all-in-one/group_vars/nfs.yml index 2a92b25..8dbd79f 100644 --- a/all-in-one/group_vars/nfs.yml +++ b/all-in-one/group_vars/nfs.yml @@ -14,4 +14,4 @@ cache_port: 11212 # memcached cachesize memcached_lock_cachesize: 512 -memcached_cache_cachesize: 512 \ No newline at end of file +memcached_cache_cachesize: 512 diff --git a/all-in-one/resource/bastion/tmp/personium-init-svcmgr.sh.j2 b/all-in-one/resource/bastion/tmp/personium-init-svcmgr.sh.j2 index fd64eeb..5def217 100644 --- a/all-in-one/resource/bastion/tmp/personium-init-svcmgr.sh.j2 +++ b/all-in-one/resource/bastion/tmp/personium-init-svcmgr.sh.j2 @@ -50,7 +50,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} failed." exit 2 fi } diff --git a/all-in-one/tasks/es/init_service_elasticsearch.yml b/all-in-one/tasks/es/init_service_elasticsearch.yml index c221fd1..e5d6cb0 100644 --- a/all-in-one/tasks/es/init_service_elasticsearch.yml +++ b/all-in-one/tasks/es/init_service_elasticsearch.yml @@ -11,7 +11,7 @@ - name: Reflect sysctl.conf command: sysctl -p - + - name: Start elasticsearch systemd: name: elasticsearch diff --git a/all-in-one/tasks/web/init_nginx_install.yml b/all-in-one/tasks/web/init_nginx_install.yml index 1da6905..2e0deaf 100644 --- a/all-in-one/tasks/web/init_nginx_install.yml +++ b/all-in-one/tasks/web/init_nginx_install.yml @@ -27,7 +27,6 @@ - name: Install patch yum: name=patch state=latest - - name: Download nginx-{{ nginx_version }}.tar.gz get_url: url=http://nginx.org/download/nginx-{{ nginx_version }}.tar.gz dest=/usr/local/src/nginx-{{ nginx_version }}.tar.gz From f410e2f9621012749c35d5d8d5d0023f57648660 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 25 Aug 2022 17:32:22 +0900 Subject: [PATCH 02/16] update java version to 17 --- 3-tier/tasks/common/init_jdk.yml | 12 ++++++------ all-in-one/tasks/common/init_jdk.yml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3-tier/tasks/common/init_jdk.yml b/3-tier/tasks/common/init_jdk.yml index 229f2f7..43876ba 100644 --- a/3-tier/tasks/common/init_jdk.yml +++ b/3-tier/tasks/common/init_jdk.yml @@ -1,19 +1,19 @@ -# Copyright FUJITSU LIMITED 2015-2019. +# Copyright FUJITSU LIMITED 2015-2022. - name: Download JDK - command: 'wget -q -O /usr/src/jdk8u192-b12.tar.gz https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u192-b12/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz creates=/usr/src/jdk8u192-b12.tar.gz' + command: 'wget -q -O /usr/src/jdk-17.0.4.1+1.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz creates=/usr/src/jdk-17.0.4.1+1.tar.gz' - name: Expand JDK - command: "tar -xzf /usr/src/jdk8u192-b12.tar.gz -C /usr/src creates=/usr/src/jdk8u192-b12" + command: "tar -xzf /usr/src/jdk-17.0.4.1+1.tar.gz -C /usr/src creates=/usr/src/jdk-17.0.4.1+1" - name: Change owner JDK - file: "state=directory path=/usr/src/jdk8u192-b12 owner=root group=root recurse=yes" + file: "state=directory path=/usr/src/jdk-17.0.4.1+1 owner=root group=root recurse=yes" - name: Deploy JDK - command: "mv /usr/src/jdk8u192-b12 /opt creates=/opt/jdk8u192-b12" + command: "mv /usr/src/jdk-17.0.4.1+1 /opt creates=/opt/jdk-17.0.4.1+1" - name: Create smlink /opt/jdk - file: "state=link src=/opt/jdk8u192-b12 dest=/opt/jdk" + file: "state=link src=/opt/jdk-17.0.4.1+1 dest=/opt/jdk" - name: Add JDK to environment variable copy: src=./resource/common/etc/bashrc dest=/etc/bashrc owner=root group=root mode=0644 diff --git a/all-in-one/tasks/common/init_jdk.yml b/all-in-one/tasks/common/init_jdk.yml index 229f2f7..f2c1edb 100644 --- a/all-in-one/tasks/common/init_jdk.yml +++ b/all-in-one/tasks/common/init_jdk.yml @@ -1,19 +1,19 @@ # Copyright FUJITSU LIMITED 2015-2019. - name: Download JDK - command: 'wget -q -O /usr/src/jdk8u192-b12.tar.gz https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u192-b12/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz creates=/usr/src/jdk8u192-b12.tar.gz' + command: 'wget -q -O /usr/src/jdk-17.0.4.1+1.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz creates=/usr/src/jdk-17.0.4.1+1.tar.gz' - name: Expand JDK - command: "tar -xzf /usr/src/jdk8u192-b12.tar.gz -C /usr/src creates=/usr/src/jdk8u192-b12" + command: "tar -xzf /usr/src/jdk-17.0.4.1+1.tar.gz -C /usr/src creates=/usr/src/jdk-17.0.4.1+1" - name: Change owner JDK - file: "state=directory path=/usr/src/jdk8u192-b12 owner=root group=root recurse=yes" + file: "state=directory path=/usr/src/jdk-17.0.4.1+1 owner=root group=root recurse=yes" - name: Deploy JDK - command: "mv /usr/src/jdk8u192-b12 /opt creates=/opt/jdk8u192-b12" + command: "mv /usr/src/jdk-17.0.4.1+1 /opt creates=/opt/jdk-17.0.4.1+1" - name: Create smlink /opt/jdk - file: "state=link src=/opt/jdk8u192-b12 dest=/opt/jdk" + file: "state=link src=/opt/jdk-17.0.4.1+1 dest=/opt/jdk" - name: Add JDK to environment variable copy: src=./resource/common/etc/bashrc dest=/etc/bashrc owner=root group=root mode=0644 From ef62a37bb451b301374eae7d9184378b00b0c570 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Tue, 11 Oct 2022 02:43:31 +0000 Subject: [PATCH 03/16] modify url of extension release --- 3-tier/group_vars/ap.yml | 10 +++++----- 3-tier/tasks/ap/personium_deploy.yml | 8 ++++---- all-in-one/group_vars/ap.yml | 10 +++++----- all-in-one/tasks/ap/personium_deploy.yml | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/3-tier/group_vars/ap.yml b/3-tier/group_vars/ap.yml index 6157434..bd92297 100644 --- a/3-tier/group_vars/ap.yml +++ b/3-tier/group_vars/ap.yml @@ -18,12 +18,12 @@ cache_manager: memcached tomcat_version: 9.0.27 -commons_daemon_version : 1.2.2 +commons_daemon_version: 1.2.2 activemq_version: 5.15.8 # engine extensions install_engine_extensions: yes -ex_ew_services_ver: 1.0.2 -ex_httpclient_ver: 1.1.5 -ex_mailsender_ver: 1.5.3 -ex_slack_ver: 1.0.2 +ex_ew_services_ver: 1.0.3 +ex_httpclient_ver: 1.2.0 +ex_mailsender_ver: 1.5.4 +ex_slack_ver: 1.0.3 diff --git a/3-tier/tasks/ap/personium_deploy.yml b/3-tier/tasks/ap/personium_deploy.yml index 1d3342b..75c76e5 100644 --- a/3-tier/tasks/ap/personium_deploy.yml +++ b/3-tier/tasks/ap/personium_deploy.yml @@ -48,10 +48,10 @@ group: personium mode: '0644' with_items: - - "https://personium.io/mvnrepo/io/personium/personium-ex-ew-services/{{ ex_ew_services_ver }}/personium-ex-ew-services-{{ ex_ew_services_ver }}-libs.jar" - - "https://personium.io/mvnrepo/io/personium/personium-ex-httpclient/{{ ex_httpclient_ver }}/personium-ex-httpclient-{{ ex_httpclient_ver }}-libs.jar" - - "https://personium.io/mvnrepo/io/personium/personium-ex-mailsender/{{ ex_mailsender_ver }}/personium-ex-mailsender-{{ ex_mailsender_ver }}-libs.jar" - - "https://personium.io/mvnrepo/io/personium/personium-ex-slack/{{ ex_slack_ver}}/personium-ex-slack-{{ ex_slack_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-ew-services/releases/download/v{{ ex_ew_services_ver }}/personium-ex-ew-services-{{ ex_ew_services_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-httpclient/releases/download/v{{ ex_httpclient_ver }}/personium-ex-httpclient-{{ ex_httpclient_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-mailsender/releases/download/v{{ ex_mailsender_ver }}/personium-ex-mailsender-{{ ex_mailsender_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-slack-messenger/releases/download/v{{ ex_slack_ver }}/personium-ex-slack-messenger-{{ ex_slack_ver }}-libs.jar" when: install_engine_extensions | bool - name: Start tomcat diff --git a/all-in-one/group_vars/ap.yml b/all-in-one/group_vars/ap.yml index c1397a6..5c9741f 100644 --- a/all-in-one/group_vars/ap.yml +++ b/all-in-one/group_vars/ap.yml @@ -18,12 +18,12 @@ cache_manager: memcached tomcat_version: 9.0.27 -commons_daemon_version : 1.2.2 +commons_daemon_version: 1.2.2 activemq_version: 5.15.8 # engine extensions install_engine_extensions: yes -ex_ew_services_ver: 1.0.2 -ex_httpclient_ver: 1.1.5 -ex_mailsender_ver: 1.5.3 -ex_slack_ver: 1.0.2 +ex_ew_services_ver: 1.0.3 +ex_httpclient_ver: 1.2.0 +ex_mailsender_ver: 1.5.4 +ex_slack_ver: 1.0.3 diff --git a/all-in-one/tasks/ap/personium_deploy.yml b/all-in-one/tasks/ap/personium_deploy.yml index 8d91c47..0baedd5 100644 --- a/all-in-one/tasks/ap/personium_deploy.yml +++ b/all-in-one/tasks/ap/personium_deploy.yml @@ -45,10 +45,10 @@ group: personium mode: '0644' with_items: - - "https://personium.io/mvnrepo/io/personium/personium-ex-ew-services/{{ ex_ew_services_ver }}/personium-ex-ew-services-{{ ex_ew_services_ver }}-libs.jar" - - "https://personium.io/mvnrepo/io/personium/personium-ex-httpclient/{{ ex_httpclient_ver }}/personium-ex-httpclient-{{ ex_httpclient_ver }}-libs.jar" - - "https://personium.io/mvnrepo/io/personium/personium-ex-mailsender/{{ ex_mailsender_ver }}/personium-ex-mailsender-{{ ex_mailsender_ver }}-libs.jar" - - "https://personium.io/mvnrepo/io/personium/personium-ex-slack/{{ ex_slack_ver}}/personium-ex-slack-{{ ex_slack_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-ew-services/releases/download/v{{ ex_ew_services_ver }}/personium-ex-ew-services-{{ ex_ew_services_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-httpclient/releases/download/v{{ ex_httpclient_ver }}/personium-ex-httpclient-{{ ex_httpclient_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-mailsender/releases/download/v{{ ex_mailsender_ver }}/personium-ex-mailsender-{{ ex_mailsender_ver }}-libs.jar" + - "https://github.com/personium/personium-ex-slack-messenger/releases/download/v{{ ex_slack_ver }}/personium-ex-slack-messenger-{{ ex_slack_ver }}-libs.jar" when: install_engine_extensions | bool - name: Start tomcat From d447d3054511a7d0a0dab99e35748998cf1a50f4 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Wed, 19 Oct 2022 09:55:50 +0000 Subject: [PATCH 04/16] modify to download war file from github releases --- all-in-one/bastion.yml | 18 ++++++++++-------- all-in-one/group_vars/bastion.yml | 6 ++++-- .../tasks/bastion/download_personium.yml | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 all-in-one/tasks/bastion/download_personium.yml diff --git a/all-in-one/bastion.yml b/all-in-one/bastion.yml index 56c7bc4..5887210 100644 --- a/all-in-one/bastion.yml +++ b/all-in-one/bastion.yml @@ -1,12 +1,14 @@ # Copyright FUJITSU LIMITED 2015-2017. -- include: ./tasks/bastion/git_clone.yml -- include: ./tasks/bastion/init_maven.yml +- include: ./tasks/bastion/download_personium.yml -- include: ./tasks/bastion/mvn_package.yml - vars: - build_mod: core +# - include: ./tasks/bastion/git_clone.yml +# - include: ./tasks/bastion/init_maven.yml -- include: ./tasks/bastion/mvn_package.yml - vars: - build_mod: engine +# - include: ./tasks/bastion/mvn_package.yml +# vars: +# build_mod: core + +# - include: ./tasks/bastion/mvn_package.yml +# vars: +# build_mod: engine diff --git a/all-in-one/group_vars/bastion.yml b/all-in-one/group_vars/bastion.yml index 358f662..0ff4a95 100644 --- a/all-in-one/group_vars/bastion.yml +++ b/all-in-one/group_vars/bastion.yml @@ -2,6 +2,8 @@ tag_ServerType: bastion -personium_core_version : master +personium_core_version: 1.8.0 +personium_core_sha256: 1457ed813f079ee34ea12835b892543189f84a8a6819b7eff011d41b5b87c65d -personium_engine_version : master +personium_engine_version: 1.6.0 +personium_engine_sha256: 0ec57828248b728bb6eb0c36e8071222677f1f7ff16b28f7a7ec90703e1fc4a1 diff --git a/all-in-one/tasks/bastion/download_personium.yml b/all-in-one/tasks/bastion/download_personium.yml new file mode 100644 index 0000000..dea1f86 --- /dev/null +++ b/all-in-one/tasks/bastion/download_personium.yml @@ -0,0 +1,16 @@ +# Copyright FUJITSU LIMITED 2015-2022. +--- + +- name: Download personium war from github + ansible.builtin.get_url: + url: https://github.com/personium/personium-core/releases/download/v{{ personium_core_version }}/personium-core-{{ personium_core_version }}.war + dest: ./resource/ap/opt/tomcat/webapps/personium-core.war + checksum: "sha256:{{ personium_core_sha256 }}" + mode: 0644 + +- name: Download personium war from github + ansible.builtin.get_url: + url: https://github.com/personium/personium-engine/releases/download/v{{ personium_engine_version }}/personium-engine-{{ personium_engine_version }}.war + dest: ./resource/ap/opt/tomcat/webapps/personium-engine.war + checksum: "sha256:{{ personium_engine_sha256 }}" + mode: 0644 From f026e46bd89bc474a2b9209510c285c50dc04557 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Wed, 19 Oct 2022 10:19:31 +0000 Subject: [PATCH 05/16] update 3-tier --- 3-tier/bastion.yml | 18 +++++++++--------- 3-tier/group_vars/bastion.yml | 6 ++++-- 3-tier/tasks/bastion/download_personium.yml | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 3-tier/tasks/bastion/download_personium.yml diff --git a/3-tier/bastion.yml b/3-tier/bastion.yml index c4907a9..43e7a8e 100644 --- a/3-tier/bastion.yml +++ b/3-tier/bastion.yml @@ -1,13 +1,13 @@ # Copyright FUJITSU LIMITED 2015-2017. -- include: ./tasks/bastion/git_clone.yml -- include: ./tasks/bastion/init_maven.yml -- include: ./tasks/bastion/mvn_package.yml - vars: - build_mod: core +- include: ./tasks/bastion/download_personium.yml +# - include: ./tasks/bastion/git_clone.yml +# - include: ./tasks/bastion/init_maven.yml +# - include: ./tasks/bastion/mvn_package.yml +# vars: +# build_mod: core -- include: ./tasks/bastion/mvn_package.yml - vars: - build_mod: engine +# - include: ./tasks/bastion/mvn_package.yml +# vars: +# build_mod: engine - include: ./tasks/bastion/init_personium_regression.yml - diff --git a/3-tier/group_vars/bastion.yml b/3-tier/group_vars/bastion.yml index 358f662..0ff4a95 100644 --- a/3-tier/group_vars/bastion.yml +++ b/3-tier/group_vars/bastion.yml @@ -2,6 +2,8 @@ tag_ServerType: bastion -personium_core_version : master +personium_core_version: 1.8.0 +personium_core_sha256: 1457ed813f079ee34ea12835b892543189f84a8a6819b7eff011d41b5b87c65d -personium_engine_version : master +personium_engine_version: 1.6.0 +personium_engine_sha256: 0ec57828248b728bb6eb0c36e8071222677f1f7ff16b28f7a7ec90703e1fc4a1 diff --git a/3-tier/tasks/bastion/download_personium.yml b/3-tier/tasks/bastion/download_personium.yml new file mode 100644 index 0000000..dea1f86 --- /dev/null +++ b/3-tier/tasks/bastion/download_personium.yml @@ -0,0 +1,16 @@ +# Copyright FUJITSU LIMITED 2015-2022. +--- + +- name: Download personium war from github + ansible.builtin.get_url: + url: https://github.com/personium/personium-core/releases/download/v{{ personium_core_version }}/personium-core-{{ personium_core_version }}.war + dest: ./resource/ap/opt/tomcat/webapps/personium-core.war + checksum: "sha256:{{ personium_core_sha256 }}" + mode: 0644 + +- name: Download personium war from github + ansible.builtin.get_url: + url: https://github.com/personium/personium-engine/releases/download/v{{ personium_engine_version }}/personium-engine-{{ personium_engine_version }}.war + dest: ./resource/ap/opt/tomcat/webapps/personium-engine.war + checksum: "sha256:{{ personium_engine_sha256 }}" + mode: 0644 From 5d2b4bbb1c2f91530298451c5c9a86667aa5910a Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:40:40 +0000 Subject: [PATCH 06/16] fix tomcat env for java 17 --- 3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 | 3 +-- all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 b/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 index 1ce2881..2901f22 100644 --- a/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 +++ b/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 @@ -32,8 +32,7 @@ export JAVA_OPTS=" \ -Xms{{ tomcat_xms }} -Xmx{{ tomcat_xmx }} \ -XX:MetaspaceSize={{ tomcat_metaspace_size }} -XX:MaxMetaspaceSize={{ tomcat_max_metaspace_size }} \ -XX:+HeapDumpOnOutOfMemoryError \ - -XX:+PrintGCDetails \ - -XX:+PrintGCTimeStamps \ + -Xlog:gc*:file=$LOG_DIR/gc_%p_%t.log::filecount=5,filesize=10k:time \ -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \ -Dlogback.configurationFile=/opt/logback/logback.xml \ -Dio.personium.configurationFile=/personium/personium-core/conf/18888/personium-unit-config.properties \ diff --git a/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 b/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 index 1ce2881..2901f22 100644 --- a/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 +++ b/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 @@ -32,8 +32,7 @@ export JAVA_OPTS=" \ -Xms{{ tomcat_xms }} -Xmx{{ tomcat_xmx }} \ -XX:MetaspaceSize={{ tomcat_metaspace_size }} -XX:MaxMetaspaceSize={{ tomcat_max_metaspace_size }} \ -XX:+HeapDumpOnOutOfMemoryError \ - -XX:+PrintGCDetails \ - -XX:+PrintGCTimeStamps \ + -Xlog:gc*:file=$LOG_DIR/gc_%p_%t.log::filecount=5,filesize=10k:time \ -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \ -Dlogback.configurationFile=/opt/logback/logback.xml \ -Dio.personium.configurationFile=/personium/personium-core/conf/18888/personium-unit-config.properties \ From 8f13804279ac022559f899562ce9de6b426ba0c9 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:53:42 +0000 Subject: [PATCH 07/16] fix --- 3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 | 2 +- all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 b/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 index 2901f22..a9e7eae 100644 --- a/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 +++ b/3-tier/resource/ap/opt/tomcat/bin/setenv.sh.j2 @@ -32,7 +32,7 @@ export JAVA_OPTS=" \ -Xms{{ tomcat_xms }} -Xmx{{ tomcat_xmx }} \ -XX:MetaspaceSize={{ tomcat_metaspace_size }} -XX:MaxMetaspaceSize={{ tomcat_max_metaspace_size }} \ -XX:+HeapDumpOnOutOfMemoryError \ - -Xlog:gc*:file=$LOG_DIR/gc_%p_%t.log::filecount=5,filesize=10k:time \ + -Xlog:gc*:file=$CATALINA_BASE/logs/gc_%p_%t.log::filecount=5,filesize=10k:time \ -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \ -Dlogback.configurationFile=/opt/logback/logback.xml \ -Dio.personium.configurationFile=/personium/personium-core/conf/18888/personium-unit-config.properties \ diff --git a/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 b/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 index 2901f22..a9e7eae 100644 --- a/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 +++ b/all-in-one/resource/ap/opt/tomcat/bin/setenv.sh.j2 @@ -32,7 +32,7 @@ export JAVA_OPTS=" \ -Xms{{ tomcat_xms }} -Xmx{{ tomcat_xmx }} \ -XX:MetaspaceSize={{ tomcat_metaspace_size }} -XX:MaxMetaspaceSize={{ tomcat_max_metaspace_size }} \ -XX:+HeapDumpOnOutOfMemoryError \ - -Xlog:gc*:file=$LOG_DIR/gc_%p_%t.log::filecount=5,filesize=10k:time \ + -Xlog:gc*:file=$CATALINA_BASE/logs/gc_%p_%t.log::filecount=5,filesize=10k:time \ -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \ -Dlogback.configurationFile=/opt/logback/logback.xml \ -Dio.personium.configurationFile=/personium/personium-core/conf/18888/personium-unit-config.properties \ From 9d4dd89b7d766d56b73a073a29ed3be6ca67ab51 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Tue, 25 Oct 2022 06:29:06 +0000 Subject: [PATCH 08/16] replace wget with get_url --- 3-tier/tasks/common/init_jdk.yml | 10 ++++++++-- all-in-one/tasks/common/init_jdk.yml | 12 +++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/3-tier/tasks/common/init_jdk.yml b/3-tier/tasks/common/init_jdk.yml index 43876ba..10a4d3c 100644 --- a/3-tier/tasks/common/init_jdk.yml +++ b/3-tier/tasks/common/init_jdk.yml @@ -1,10 +1,16 @@ # Copyright FUJITSU LIMITED 2015-2022. - name: Download JDK - command: 'wget -q -O /usr/src/jdk-17.0.4.1+1.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz creates=/usr/src/jdk-17.0.4.1+1.tar.gz' + ansible.builtin.get_url: + url: https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz + dest: /usr/src/jdk-17.0.4.1+1.tar.gz + mode: 0660 - name: Expand JDK - command: "tar -xzf /usr/src/jdk-17.0.4.1+1.tar.gz -C /usr/src creates=/usr/src/jdk-17.0.4.1+1" + ansible.builtin.unarchive: + src: /usr/src/jdk-17.0.4.1+1.tar.gz + dest: /usr/src + remote_src: true - name: Change owner JDK file: "state=directory path=/usr/src/jdk-17.0.4.1+1 owner=root group=root recurse=yes" diff --git a/all-in-one/tasks/common/init_jdk.yml b/all-in-one/tasks/common/init_jdk.yml index f2c1edb..10a4d3c 100644 --- a/all-in-one/tasks/common/init_jdk.yml +++ b/all-in-one/tasks/common/init_jdk.yml @@ -1,10 +1,16 @@ -# Copyright FUJITSU LIMITED 2015-2019. +# Copyright FUJITSU LIMITED 2015-2022. - name: Download JDK - command: 'wget -q -O /usr/src/jdk-17.0.4.1+1.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz creates=/usr/src/jdk-17.0.4.1+1.tar.gz' + ansible.builtin.get_url: + url: https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz + dest: /usr/src/jdk-17.0.4.1+1.tar.gz + mode: 0660 - name: Expand JDK - command: "tar -xzf /usr/src/jdk-17.0.4.1+1.tar.gz -C /usr/src creates=/usr/src/jdk-17.0.4.1+1" + ansible.builtin.unarchive: + src: /usr/src/jdk-17.0.4.1+1.tar.gz + dest: /usr/src + remote_src: true - name: Change owner JDK file: "state=directory path=/usr/src/jdk-17.0.4.1+1 owner=root group=root recurse=yes" From 85cd7a6ead93ea2f8ba713d4b1fc80906e5c2c34 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:13:19 +0000 Subject: [PATCH 09/16] add gitignore --- 3-tier/.gitignore | 3 +++ all-in-one/.gitignore | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 3-tier/.gitignore create mode 100644 all-in-one/.gitignore diff --git a/3-tier/.gitignore b/3-tier/.gitignore new file mode 100644 index 0000000..7b8e980 --- /dev/null +++ b/3-tier/.gitignore @@ -0,0 +1,3 @@ +ansible.log + +personium_regression.sh \ No newline at end of file diff --git a/all-in-one/.gitignore b/all-in-one/.gitignore new file mode 100644 index 0000000..7b8e980 --- /dev/null +++ b/all-in-one/.gitignore @@ -0,0 +1,3 @@ +ansible.log + +personium_regression.sh \ No newline at end of file From 0ead3c829652605501d1f74d0bb5f39219a075d2 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:13:57 +0000 Subject: [PATCH 10/16] update middleware versions --- 3-tier/group_vars/ap.yml | 6 +++--- all-in-one/group_vars/ap.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3-tier/group_vars/ap.yml b/3-tier/group_vars/ap.yml index bd92297..56f400f 100644 --- a/3-tier/group_vars/ap.yml +++ b/3-tier/group_vars/ap.yml @@ -17,9 +17,9 @@ cache_port: 11212 cache_manager: memcached -tomcat_version: 9.0.27 -commons_daemon_version: 1.2.2 -activemq_version: 5.15.8 +tomcat_version: 9.0.68 +commons_daemon_version: 1.3.1 +activemq_version: 5.15.14 # engine extensions install_engine_extensions: yes diff --git a/all-in-one/group_vars/ap.yml b/all-in-one/group_vars/ap.yml index 5c9741f..0c6db80 100644 --- a/all-in-one/group_vars/ap.yml +++ b/all-in-one/group_vars/ap.yml @@ -17,9 +17,9 @@ cache_port: 11212 cache_manager: memcached -tomcat_version: 9.0.27 -commons_daemon_version: 1.2.2 -activemq_version: 5.15.8 +tomcat_version: 9.0.68 +commons_daemon_version: 1.3.1 +activemq_version: 5.15.14 # engine extensions install_engine_extensions: yes From f42f139355c8b23d941ecb9898f4c165c905a33f Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:14:44 +0000 Subject: [PATCH 11/16] update nginx versions --- 3-tier/group_vars/web.yml | 2 +- all-in-one/group_vars/web.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3-tier/group_vars/web.yml b/3-tier/group_vars/web.yml index adee228..b2b46fb 100644 --- a/3-tier/group_vars/web.yml +++ b/3-tier/group_vars/web.yml @@ -2,5 +2,5 @@ tag_ServerType: web -nginx_version: 1.14.2 +nginx_version: 1.19.0 nginx_hm_version: 0.33 diff --git a/all-in-one/group_vars/web.yml b/all-in-one/group_vars/web.yml index adee228..b2b46fb 100644 --- a/all-in-one/group_vars/web.yml +++ b/all-in-one/group_vars/web.yml @@ -2,5 +2,5 @@ tag_ServerType: web -nginx_version: 1.14.2 +nginx_version: 1.19.0 nginx_hm_version: 0.33 From f01c45ce4df9730af425c5fd2c12c85bd8321fee Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 27 Oct 2022 10:38:36 +0900 Subject: [PATCH 12/16] update nginx version --- 3-tier/group_vars/web.yml | 2 +- all-in-one/group_vars/web.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3-tier/group_vars/web.yml b/3-tier/group_vars/web.yml index b2b46fb..4d3be65 100644 --- a/3-tier/group_vars/web.yml +++ b/3-tier/group_vars/web.yml @@ -2,5 +2,5 @@ tag_ServerType: web -nginx_version: 1.19.0 +nginx_version: 1.23.2 nginx_hm_version: 0.33 diff --git a/all-in-one/group_vars/web.yml b/all-in-one/group_vars/web.yml index b2b46fb..4d3be65 100644 --- a/all-in-one/group_vars/web.yml +++ b/all-in-one/group_vars/web.yml @@ -2,5 +2,5 @@ tag_ServerType: web -nginx_version: 1.19.0 +nginx_version: 1.23.2 nginx_hm_version: 0.33 From 6d4a54a7af8a1cad1ccd85a2185b6a49dbb94e5e Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 27 Oct 2022 10:58:28 +0900 Subject: [PATCH 13/16] add gitignore --- all-in-one/.gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/all-in-one/.gitignore b/all-in-one/.gitignore index 7b8e980..bec93b8 100644 --- a/all-in-one/.gitignore +++ b/all-in-one/.gitignore @@ -1,3 +1,12 @@ ansible.log -personium_regression.sh \ No newline at end of file +personium_regression.sh + +# binary files +resource/ap/opt/tomcat/webapps/personium-core.war +resource/ap/opt/tomcat/webapps/personium-engine.war + +# certifications +resource/ap/opt/x509/unit-self-sign.crt +resource/ap/opt/x509/unit.csr +resource/ap/opt/x509/unit.key \ No newline at end of file From 3c81f3341fb59d89715c3f9b72a8a12963be81e6 Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:02:51 +0900 Subject: [PATCH 14/16] update changelog --- CHANGELOG.md | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..4637993 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,98 @@ +## 2.1.0 + +Compatible Personium version: 1.8.0 + +MISC: + +- Downloading war files from GitHub releases. #166 +- Downloading extension jar files from GitHub releases. #163 +- Installing Java 17. #161 + +See: https://github.com/personium/ansible/milestone/6?closed=1 + +## 2.0.11 + +See: https://github.com/personium/ansible/milestone/8?closed=1 + +## 2.0.10 + +See: https://github.com/personium/ansible/milestone/5?closed=1 + +## 2.0.9 + +See: https://github.com/personium/ansible/milestone/4?closed=1 + +## 2.0.8a + +Bug fixes: + +- Fix web_private_ip. #107 + +## 2.0.8 + +Enhancement: + +- Fix static_inventory/hosts uses many duplicated variables #99 +- Separation of bastion and web #97 +- X-Personium-RequestKey header output in nginx logs #89 +- Upgrade middlewares #103 + +BugFixes: + +- SSH user is hard-coded. #98 + +## 2.0.7 + +Support percell fqdn +Corresponded to ElasticSearch 6.6.1 + +## 2.0.6 + +Corresponded to ElasticSearch 5.6.14 + +## 2.0.5 + +Corresponded to OpenJDK 8. +Corresponded to tomcat 9.c + +## 2.0.4 + +Merge pull request #43 from naoya-mokudai/develop + +Fix URL mistake + +## 2.0.3 + +Merge pull request #33 from personium/2.0.3_dev + +2.0.3 release + +## 2.0.2 + +Release v2.0.2 + +## 2.0.1 + +Changing the specification key of host file. + +This ansible has already been confirmed with Personium v1.5.3. + +## 2.0.0 + +ansible for Personium v1.5.2 or later. + +## 1.5.1 + +ansible for Personium v1.5.1 #13 + +## 1.5.0 + +ansible for Personium v1.5.0 #11 + +## 1.4.5 + +Core and Engine version used for ansible are fixed to 1.4.5. + +## 1.4.3 + +Optimized for Personium v1.4.3. \ No newline at end of file From 0587b13e5287b3e78810d04b1ee9f0c9eb7fc63b Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:04:48 +0900 Subject: [PATCH 15/16] update changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4637993..f390132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,15 @@ Compatible Personium version: 1.8.0 +Enhancement: + +- Update Java version to 17. #161 +- Update middlewares. #167 + MISC: - Downloading war files from GitHub releases. #166 - Downloading extension jar files from GitHub releases. #163 -- Installing Java 17. #161 See: https://github.com/personium/ansible/milestone/6?closed=1 From d19b1ffe0d54f5f0ca0ff1a6b46f887f2455bf8b Mon Sep 17 00:00:00 2001 From: ishiguro-yo <4243145+yoh1496@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:05:04 +0900 Subject: [PATCH 16/16] update .gitignore --- 3-tier/.gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/3-tier/.gitignore b/3-tier/.gitignore index 7b8e980..bec93b8 100644 --- a/3-tier/.gitignore +++ b/3-tier/.gitignore @@ -1,3 +1,12 @@ ansible.log -personium_regression.sh \ No newline at end of file +personium_regression.sh + +# binary files +resource/ap/opt/tomcat/webapps/personium-core.war +resource/ap/opt/tomcat/webapps/personium-engine.war + +# certifications +resource/ap/opt/x509/unit-self-sign.crt +resource/ap/opt/x509/unit.csr +resource/ap/opt/x509/unit.key \ No newline at end of file