From af5f5930d159bad9bc74f4e3cb19f4226d1a91e2 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Sun, 18 Oct 2015 20:25:51 +0200 Subject: [PATCH] Changed the supervisor name from zulippostsetup to zulip_postsetup --- .../conf.d/{zulippostsetup.conf => zulip_postsetup.conf} | 4 ++-- includes/zulip-puppet/manifests/voyager.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename includes/zulip-puppet/files/supervisor/conf.d/{zulippostsetup.conf => zulip_postsetup.conf} (80%) diff --git a/includes/zulip-puppet/files/supervisor/conf.d/zulippostsetup.conf b/includes/zulip-puppet/files/supervisor/conf.d/zulip_postsetup.conf similarity index 80% rename from includes/zulip-puppet/files/supervisor/conf.d/zulippostsetup.conf rename to includes/zulip-puppet/files/supervisor/conf.d/zulip_postsetup.conf index 51e60af..26e8f32 100644 --- a/includes/zulip-puppet/files/supervisor/conf.d/zulippostsetup.conf +++ b/includes/zulip-puppet/files/supervisor/conf.d/zulip_postsetup.conf @@ -1,4 +1,4 @@ -[program:zulippostsetup] +[program:zulip_postsetup] command=/usr/bin/bash -c "sleep 5 && /usr/local/bin/createZulipUser.sh" priority=300 ; the relative start priority (default 999) autostart=true ; start at supervisord start (default: true) @@ -6,4 +6,4 @@ autorestart=false ; whether/when to restart (default: unexpected) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) user=zulip ; setuid to this UNIX account to run the program redirect_stderr=true ; redirect proc stderr to stdout (default false) -stdout_logfile=/var/log/zulip/fts-updates.log ; stdout log path, NONE for none; default AUTO +stdout_logfile=/var/log/zulip/zulip_postsetup.log ; stdout log path, NONE for none; default AUTO diff --git a/includes/zulip-puppet/manifests/voyager.pp b/includes/zulip-puppet/manifests/voyager.pp index 56a4e34..34dddbe 100644 --- a/includes/zulip-puppet/manifests/voyager.pp +++ b/includes/zulip-puppet/manifests/voyager.pp @@ -48,7 +48,7 @@ class zulip::voyager { ensure => file, owner => "root", group => "root", - mode => 644, + mode => 755, source => "puppet:///modules/zulip/createZulipUser.sh", } }