X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Frpm%2Fusr%2Fsbin%2Fargeoctl;h=727ef27f4fbeac9d763062c19c8c2394e6b9cec7;hb=96c1c243ff00e3e2ff862e23662ad130dd405272;hp=bcf597bccfebfe6a23a9201040f371b918441fe3;hpb=c1c3646a246bde58cfe7953670f956d10148aeb4;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/rpm/usr/sbin/argeoctl b/dist/argeo-node/rpm/usr/sbin/argeoctl
index bcf597bcc..727ef27f4 100755
--- a/dist/argeo-node/rpm/usr/sbin/argeoctl
+++ b/dist/argeo-node/rpm/usr/sbin/argeoctl
@@ -1,15 +1,44 @@
 #!/bin/sh
 APP=argeo
 
+if [ -z "$2" ]; then
+# Default node
+CONF_DIR=/etc/$APP
+EXEC_DIR=/var/lib/$APP
+else
+# Instance
+INSTANCE=$2
+	if [ -z "$STATE_DIRECTORY" ]; then
+	INSTANCE_DIR=/var/lib/$APP.d/$INSTANCE
+	else
+	# systemd StateDirectory=
+	INSTANCE_DIR=$STATE_DIRECTORY
+	fi
+	if [ -z "$CONFIGURATION_DIRECTORY" ]; then
+	CONF_DIR=/etc/$APP.d/$INSTANCE
+	else
+	# systemd ConfigurationDirectory=
+	CONF_DIR=$CONFIGURATION_DIRECTORY
+	fi
+	
+EXEC_DIR=$INSTANCE_DIR
+
+	if [ ! -f $CONF_DIR/$APP.ini ]; then
+	cp /etc/$APP/$APP.ini $CONF_DIR
+	fi
+	if [ ! -f $CONF_DIR/log4j.properties ]; then
+	cp /etc/$APP/log4j.properties $CONF_DIR
+	fi
+fi
+
 JVM=java
 
 # Directories and files
-CONF_DIR=/etc/$APP
-CONF_DIRS=/etc/$APP/conf.d
+
 BASE_POLICY_ALL=/usr/share/$APP/all.policy
 BASE_CONFIG_INI=/usr/share/$APP/config.ini
 
-EXEC_DIR=/var/lib/$APP
+CONF_DIRS=$CONF_DIR/conf.d
 DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/state
 CONFIG_INI=$CONF_RW/config.ini