Add more commandline arguments, update Gentoo files

gentoo/files/pgmon.cfg

@@ -38,10 +38,10 @@ ipc_socket=/run/pgmon/pgmon.sock
 ##
 
 # Log level for stderr logging (or 'off')
-stderr_log_level=info
+stderr_log_level=off
 
 # Log level for file logging (od 'off')
-file_log_level=notice
+file_log_level=info
 
 # Log file
 #log_file=pgmon.log
@@ -67,4 +67,4 @@ file_log_level=notice
 # Metrics
 #metrics={}
 
-include=pgmon-metrics.cfg
+include=/etc/pgmon/pgmon-metrics.cfg

gentoo/files/pgmon.openrc

@@ -2,14 +2,19 @@
 
 extra_started_commands="reload"
 
-agent_name=${RC_SERVICE#pgmon.}
+agent_name=${SVCNAME#pgmon.}
 agent_name=${agent_name:-pgmon}
 
-command="/usr/local/bin/pgmon"
-command_args="--server --config /etc/pgmon/${agent_name}.cfg"
+CONFIG_FILE="/etc/pgmon/${agent_name}.cfg"
+PID_FILE="/run/pgmon/${agent_name}.pid"
+LOG_FILE="/var/log/${agent_name}.log"
+SOCKET="/var/run/${agent_name}.socket"
+
+command="/usr/bin/pgmon"
+command_args="--server -c '$CONFIG_FILE' -l '$LOG_FILE' -p '$PID_FILE' -s '$SOCKET'"
 command_user="zabbix:zabbix"
 
-pidfile="/run/pgmon/${agent_name}.pid"
+pidfile="$PID_FILE"
 
 start_pre() {
 	checkpath -d -m 0755 -o "${command_user}" "/run/pgmon"

gentoo/pgmon-0.0.1.ebuild

@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64"
 
-EGIT_REPO_URI="https://code2.shh-dot-com.org/pgmon.git"
+EGIT_REPO_URI="https://code2.shh-dot-com.org/james/pgmon.git"
 #EGIT_COMMIT=""
 
 IUSE="+agent agent2"
@@ -35,7 +35,11 @@ src_install() {
 	default
 
 	# Install init script
-	newinitd files/pgmon.openrc pgmon
+	newinitd "${FILESDIR}/pgmon.openrc" pgmon
+
+	# Install script
+	exeinto /usr/bin
+	newexe "${S}/pgmon.py" pgmon
 
 	# Install default config
 	diropts -o root -g zabbix -m 0755