diff --git a/shared/additional-modules/squid/manifests/debian.pp b/shared/additional-modules/squid/manifests/debian.pp index 571978c..32cc589 100644 --- a/shared/additional-modules/squid/manifests/debian.pp +++ b/shared/additional-modules/squid/manifests/debian.pp @@ -26,7 +26,7 @@ class squid::debian($version, $config_template, $error_template) { logrotate_d { 'squid': postrotate => 'service squid rotate', - pattern => "${squid::log}/access.log" + pattern => "${squid::log_dir}/access.log" } } diff --git a/shared/additional-modules/squid/templates/squid-init.d b/shared/additional-modules/squid/templates/squid-init.d index 278b519..64292a8 100644 --- a/shared/additional-modules/squid/templates/squid-init.d +++ b/shared/additional-modules/squid/templates/squid-init.d @@ -59,4 +59,10 @@ stop() { return $RETVAL } +rotate() { + $BIN $ARGS -k rotate + + return $RETVAL +} + <%= scope.function_template('base/init-d-actions') %> diff --git a/shared/templates/base/init-d-actions b/shared/templates/base/init-d-actions index 10f687e..2d5925d 100644 --- a/shared/templates/base/init-d-actions +++ b/shared/templates/base/init-d-actions @@ -9,6 +9,9 @@ case "$1" in stop start ;; + rotate) + rotate + ;; *) echo "Usage: $0 {start|stop|restart}" $RETVAL=1