From ff7c1ae7714896267dfd30dfb8b0eb98895effcb Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Fri, 7 Apr 2017 10:22:34 +0200
Subject: [PATCH] stack/logrotate, software/apache-frontend: update logrotate
 location.

---
 software/apache-frontend/buildout.hash.cfg            | 2 +-
 software/apache-frontend/instance-apache-frontend.cfg | 2 +-
 stack/logrotate/buildout.hash.cfg                     | 2 +-
 stack/logrotate/instance-logrotate-base.cfg.in        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/software/apache-frontend/buildout.hash.cfg b/software/apache-frontend/buildout.hash.cfg
index 2945b0289..efadda97e 100644
--- a/software/apache-frontend/buildout.hash.cfg
+++ b/software/apache-frontend/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = a2cd4f7ab70ca35db42cfc0dbd290373
+md5sum = e2f60121bc1116319b4d20b4c4badc1c
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
diff --git a/software/apache-frontend/instance-apache-frontend.cfg b/software/apache-frontend/instance-apache-frontend.cfg
index b9cd53a19..b649c4dae 100644
--- a/software/apache-frontend/instance-apache-frontend.cfg
+++ b/software/apache-frontend/instance-apache-frontend.cfg
@@ -355,7 +355,7 @@ command = $${logrotate:wrapper}
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
+logrotate-binary = ${logrotate:location}/sbin/logrotate
 gzip-binary = ${gzip:location}/bin/gzip
 gunzip-binary = ${gzip:location}/bin/gunzip
 # Directories
diff --git a/stack/logrotate/buildout.hash.cfg b/stack/logrotate/buildout.hash.cfg
index 5a12520da..9e7b82304 100644
--- a/stack/logrotate/buildout.hash.cfg
+++ b/stack/logrotate/buildout.hash.cfg
@@ -23,4 +23,4 @@ md5sum = 7a5ec8f141c61826a14db8619acba314
 
 [template-logrotate-base]
 filename = instance-logrotate-base.cfg.in
-md5sum = 2ec692c5dee7bcdc8071e53f090c6a31
+md5sum = 26dbc499413f9140b08fa20541d0db0f
diff --git a/stack/logrotate/instance-logrotate-base.cfg.in b/stack/logrotate/instance-logrotate-base.cfg.in
index 66241beaa..bf25a6248 100644
--- a/stack/logrotate/instance-logrotate-base.cfg.in
+++ b/stack/logrotate/instance-logrotate-base.cfg.in
@@ -50,7 +50,7 @@ pre =
 [logrotate]
 recipe = slapos.cookbook:wrapper
 parameters-extra = true
-command-line = {{ logrotate_location }}/usr/sbin/logrotate -s "${logrotate-directory:srv}/logrotate.status" "${logrotate-conf:rendered}"
+command-line = {{ logrotate_location }}/sbin/logrotate -s "${logrotate-directory:srv}/logrotate.status" "${logrotate-conf:rendered}"
 wrapper-path = ${logrotate-directory:bin}/logrotate
 
 [cron-entry-logrotate]
-- 
2.30.9