diff options
Diffstat (limited to 'modules/dashboard')
| -rw-r--r-- | modules/dashboard/manifests/init.pp | 18 | ||||
| -rw-r--r-- | modules/dashboard/templates/make_report | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/modules/dashboard/manifests/init.pp b/modules/dashboard/manifests/init.pp index ff804010..34ef41b3 100644 --- a/modules/dashboard/manifests/init.pp +++ b/modules/dashboard/manifests/init.pp @@ -1,17 +1,17 @@ class dashboard { $dashboard_login = 'dashboard' - $dashboard_home_dir = "/var/lib/$dashboard_login" - $dashboard_dir = "$dashboard_home_dir/dashboard" - $dashboard_bindir = "$dashboard_home_dir/bin" - $dashboard_wwwdir = "/var/www/vhosts/dashboard.$::domain" + $dashboard_home_dir = "/var/lib/${dashboard_login}" + $dashboard_dir = "${dashboard_home_dir}/dashboard" + $dashboard_bindir = "${dashboard_home_dir}/bin" + $dashboard_wwwdir = "/var/www/vhosts/dashboard.${::domain}" user { $dashboard_login: comment => 'dashboard system user', home => $dashboard_home_dir, } - subversion::snapshot { $dashboard_dir: - source => "svn://svn.$::domain/soft/dashboard/", + git::snapshot { $dashboard_dir: + source => "git://git.${::domain}/web/generators/dashboard", } package { 'php-cli': } @@ -26,17 +26,17 @@ class dashboard { ensure => directory, } - file { "$dashboard_bindir/make_report": + file { "${dashboard_bindir}/make_report": mode => '0755', content => template('dashboard/make_report'), } - apache::vhost::base { "dashboard.$::domain": + apache::vhost::base { "dashboard.${::domain}": location => $dashboard_wwwdir, } cron { 'update dashboard': - command => "$dashboard_bindir/make_report", + command => "${dashboard_bindir}/make_report", user => $dashboard_login, hour => '*/2', minute => '15', diff --git a/modules/dashboard/templates/make_report b/modules/dashboard/templates/make_report index 25c2f316..5da59617 100644 --- a/modules/dashboard/templates/make_report +++ b/modules/dashboard/templates/make_report @@ -1,7 +1,7 @@ #!/bin/sh -dashboard_dir='<%= dashboard_dir %>' -dashboard_wwwdir='<%= dashboard_wwwdir %>' +dashboard_dir='<%= @dashboard_dir %>' +dashboard_wwwdir='<%= @dashboard_wwwdir %>' cd "$dashboard_dir" /usr/bin/php ./make_report.php > "$dashboard_wwwdir/index.html" |