summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-19 06:16:15 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-19 06:16:15 +0000
commit1a068d7411eb8c9c2c17f0736f5eb2818c8e7607 (patch)
treed761c4ac31f18265081061b49217f3272b023728
parent386d998e79d2fd95f62480ce56795535ea971346 (diff)
parent00a482511c20dc427b10629e8a1c993472dae2b6 (diff)
downloadgitlab-ce-1a068d7411eb8c9c2c17f0736f5eb2818c8e7607.tar.gz
Merge branch 'logrotate_update_fix' into 'master'
Clean up *.log.1 files during 6.6-to-6.7 upgrade
-rw-r--r--doc/update/6.6-to-6.7.md4
-rw-r--r--doc/update/6.7-to-6.8.md3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/update/6.6-to-6.7.md b/doc/update/6.6-to-6.7.md
index 0f39c037c9f..61a63057d08 100644
--- a/doc/update/6.6-to-6.7.md
+++ b/doc/update/6.6-to-6.7.md
@@ -64,6 +64,10 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
# Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
+# Compress existing .log.1 files because we turned off delaycompress in logrotate
+sudo -u git -H gzip /home/git/gitlab/log/*.log.1
+sudo -u git -H gzip /home/git/gitlab-shell/gitlab-shell.log.1
+
# Close access to gitlab-satellites for others
sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
```
diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md
index 457433c6482..cb19d235819 100644
--- a/doc/update/6.7-to-6.8.md
+++ b/doc/update/6.7-to-6.8.md
@@ -64,9 +64,6 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
-# Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
-sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
-
# Close access to gitlab-satellites for others
sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
```