diff options
| -rw-r--r-- | ansible/roles/rrdstats/templates/generate-rrd-stats.sh.j2 | 18 | ||||
| -rw-r--r-- | ansible/roles/rrdstats/templates/generate-rrdtool-stats.service.j2 | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/ansible/roles/rrdstats/templates/generate-rrd-stats.sh.j2 b/ansible/roles/rrdstats/templates/generate-rrd-stats.sh.j2 index e26966d..229418f 100644 --- a/ansible/roles/rrdstats/templates/generate-rrd-stats.sh.j2 +++ b/ansible/roles/rrdstats/templates/generate-rrd-stats.sh.j2 @@ -2,23 +2,21 @@ set -eu -HERE="$(dirname "$0")" -DATA="$HERE/data" +if [ "$STATE_DIRECTORY" = "" ]; then + echo "The \$STATE_DIRECTORY parameter must be set" + exit 1 +fi -MESSAGES_RRD="$DATA/messages.rrd" -THREADS_RRD="$DATA/threads.rrd" -USERS_RRD="$DATA/users.rrd" -LAST_RUN_FILE="$DATA/last_run" +MESSAGES_RRD="$STATE_DIRECTORY/messages.rrd" +THREADS_RRD="$STATE_DIRECTORY/threads.rrd" +USERS_RRD="$STATE_DIRECTORY/users.rrd" +LAST_RUN_FILE="$STATE_DIRECTORY/last_run" if [ "$DB_DSN" = "" ]; then echo "The \$DB_DSN parameter must be set" exit 1 fi -if [ ! -d "$DATA" ]; then - mkdir "$DATA" -fi - # critter crunch crumbling if [ ! -f "$MESSAGES_RRD" ]; then rrdtool create "$MESSAGES_RRD" \ diff --git a/ansible/roles/rrdstats/templates/generate-rrdtool-stats.service.j2 b/ansible/roles/rrdstats/templates/generate-rrdtool-stats.service.j2 index 6528600..5122e84 100644 --- a/ansible/roles/rrdstats/templates/generate-rrdtool-stats.service.j2 +++ b/ansible/roles/rrdstats/templates/generate-rrdtool-stats.service.j2 @@ -7,6 +7,7 @@ Requires = postgresql.service [Service] ExecStart = {{ rrdstats_script_path }} DynamicUser = true +Statedirectory = rrdstats User = pydis-rrdstats EnvironmentFile = {{ rrdstats_env_path }} |