From 58a5a6ab1b53d861cafe47c4edd5d3644d69b50c Mon Sep 17 00:00:00 2001 From: rudolf Date: Mon, 12 Jun 2017 03:04:37 +0300 Subject: [PATCH] Orient db role --- all.yaml | 2 +- roles/orientdb/defaults/main.yml | 5 +++-- roles/orientdb/templates/orientdb-server.sh.j2 | 2 +- roles/orientdb/templates/orientdb.service.j2 | 2 +- roles/tomcat8/meta/main.yml | 4 +++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/all.yaml b/all.yaml index 5da4bdc..38dcfc1 100644 --- a/all.yaml +++ b/all.yaml @@ -7,8 +7,8 @@ become: yes roles: - { role: apache2config } - - { role: tomcat8 } - { role: orientdb } + - { role: tomcat8 } vars: tmpl: diff --git a/roles/orientdb/defaults/main.yml b/roles/orientdb/defaults/main.yml index 2880754..c1187b5 100644 --- a/roles/orientdb/defaults/main.yml +++ b/roles/orientdb/defaults/main.yml @@ -17,8 +17,9 @@ orientdb_ssl_port_range: 2434-2440 orientdb_enable_http: True orientdb_http_port_range: 2480-2490 orientdb_force_install: False -orientdb_Xms: 128m -orientdb_Xmx: 310m +orientdb_jvm_Xms: 128m +orientdb_jvm_Xmx: 310m +orientdb_jvm_MaxDirectMemorySize: 512m orientdb_users: - name: root password: rootpwd diff --git a/roles/orientdb/templates/orientdb-server.sh.j2 b/roles/orientdb/templates/orientdb-server.sh.j2 index 5655da0..0160533 100644 --- a/roles/orientdb/templates/orientdb-server.sh.j2 +++ b/roles/orientdb/templates/orientdb-server.sh.j2 @@ -23,7 +23,7 @@ start() { echo "Starting OrientDB server daemon..." cd "$ORIENTDB_DIR/bin" - su $ORIENTDB_USER -c "export ORIENTDB_OPTS_MEMORY=\"-Xms{{orientdb_Xms}} -Xmx{{orientdb_Xmx}}\";cd \"$ORIENTDB_DIR/bin\"; /usr/bin/nohup ./server.sh 1>{{orientdb_log_dir}}/orientdb.log 2>{{orientdb_log_dir}}/orientdb.err &" + su $ORIENTDB_USER -c "export ORIENTDB_OPTS_MEMORY=\"-Xms{{orientdb_jvm_Xms}} -Xmx{{orientdb_jvm_Xmx}}\";cd \"$ORIENTDB_DIR/bin\"; /usr/bin/nohup ./server.sh 1>{{orientdb_log_dir}}/orientdb.log 2>{{orientdb_log_dir}}/orientdb.err &" } stop() { diff --git a/roles/orientdb/templates/orientdb.service.j2 b/roles/orientdb/templates/orientdb.service.j2 index d0106a1..e3f5fde 100644 --- a/roles/orientdb/templates/orientdb.service.j2 +++ b/roles/orientdb/templates/orientdb.service.j2 @@ -5,7 +5,7 @@ Wants=network.target [Service] User=orientdb -Environment=ORIENTDB_ROOT_PASSWORD='{{ orientdb_users[0].password }}' "ORIENTDB_OPTS_MEMORY=-Xms{{orientdb_Xms}} -Xmx{{orientdb_Xmx}}" +Environment=ORIENTDB_ROOT_PASSWORD='{{ orientdb_users[0].password }}' "ORIENTDB_OPTS_MEMORY=-Xms{{orientdb_jvm_Xms}} -Xmx{{orientdb_jvm_Xmx}}" "JAVA_OPTS_SCRIPT=-Djna.nosys=true -XX:+HeapDumpOnOutOfMemoryError -XX:MaxDirectMemorySize={{orientdb_jvm_MaxDirectMemorySize}} -Djava.awt.headless=true -Dfile.encoding=UTF8 -Drhino.opt.level=9" ExecStart={{ orientdb_path }}/bin/server.sh Restart=on-failure RestartSec=20 diff --git a/roles/tomcat8/meta/main.yml b/roles/tomcat8/meta/main.yml index 2e405b5..0e04d98 100644 --- a/roles/tomcat8/meta/main.yml +++ b/roles/tomcat8/meta/main.yml @@ -5,4 +5,6 @@ galaxy_info: license: license (GPLv2, CC-BY, etc) min_ansible_version: 1.2 galaxy_tags: [] -dependencies: [] + +dependencies: + - { role: jdk }