Merge branch 'logrotate' of /home/git/repositories/gitlab/gitlabhq

2 files changed, 26 insertions, 1 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 3a3b02849f1..c3325061d6b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -52,7 +52,7 @@ If you are not familiar with vim please skip this and keep using the default edi
 
 Install the required packages:
 
-    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl git-core openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
+    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl git-core openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate
 
 Make sure you have the right version of Python installed.
 
@@ -265,6 +265,9 @@ Make GitLab start on boot:
 
     sudo update-rc.d gitlab defaults 21
 
+## Set up logrotate
+
+    sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 
 ## Check Application Status
 
diff --git a/lib/support/logrotate/gitlab b/lib/support/logrotate/gitlab
new file mode 100644
index 00000000000..df9398d0795
--- /dev/null
+++ b/lib/support/logrotate/gitlab
@@ -0,0 +1,22 @@
+# GitLab logrotate settings
+# based on: http://stackoverflow.com/a/4883967
+
+/home/git/gitlab/log/*.log {
+    weekly
+    missingok
+    rotate 52
+    compress
+    delaycompress
+    notifempty
+    copytruncate
+}
+
+/home/git/gitlab-shell/gitlab-shell.log {
+    weekly
+    missingok
+    rotate 52
+    compress
+    delaycompress
+    notifempty
+    copytruncate
+}