diff options
| -rw-r--r-- | modules/viewvc/manifests/init.pp | 3 | ||||
| -rwxr-xr-x | modules/viewvc/templates/kill_viewvc.sh | 3 | ||||
| -rw-r--r-- | modules/viewvc/templates/vhost.conf | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/modules/viewvc/manifests/init.pp b/modules/viewvc/manifests/init.pp index cf5687d2..2545a8b1 100644 --- a/modules/viewvc/manifests/init.pp +++ b/modules/viewvc/manifests/init.pp @@ -33,7 +33,7 @@ class viewvc { $robotsfile = '/var/www/viewvc/robots.txt' file { $robotsfile: ensure => present, - mode => 0644, + mode => '0644', owner => root, group => root, source => 'puppet:///modules/viewvc/robots.txt', @@ -54,4 +54,3 @@ class viewvc { aliases => $vhost_aliases, } } - diff --git a/modules/viewvc/templates/kill_viewvc.sh b/modules/viewvc/templates/kill_viewvc.sh index 4c27d3f3..8c33c2ff 100755 --- a/modules/viewvc/templates/kill_viewvc.sh +++ b/modules/viewvc/templates/kill_viewvc.sh @@ -7,7 +7,6 @@ do process_mem=$(pmap "$process" | grep total | sed 's/ \+total \+\([[:digit:]]\+\)K/\1/') if [ "$process_mem" -gt "$max_memory" ] then - kill -15 "$process" + kill -15 "$process" fi done - diff --git a/modules/viewvc/templates/vhost.conf b/modules/viewvc/templates/vhost.conf index 28916f98..28e9f3d6 100644 --- a/modules/viewvc/templates/vhost.conf +++ b/modules/viewvc/templates/vhost.conf @@ -1,2 +1 @@ FastCgiServer /usr/share/viewvc/bin/wsgi/viewvc.fcgi -processes 4 -idle-timeout 30 - |