Commit 1a068d7411eb8c9c2c17f0736f5eb2818c8e7607
Exists in
spb-stable
and in
2 other branches
Merge branch 'logrotate_update_fix' into 'master'
Clean up *.log.1 files during 6.6-to-6.7 upgrade
Showing
2 changed files
with
4 additions
and
3 deletions
Show diff stats
doc/update/6.6-to-6.7.md
| @@ -64,6 +64,10 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab | @@ -64,6 +64,10 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab | ||
| 64 | # Update the logrotate configuration (keep logs for 90 days instead of 52 weeks) | 64 | # Update the logrotate configuration (keep logs for 90 days instead of 52 weeks) |
| 65 | sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab | 65 | sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab |
| 66 | 66 | ||
| 67 | +# Compress existing .log.1 files because we turned off delaycompress in logrotate | ||
| 68 | +sudo -u git -H gzip /home/git/gitlab/log/*.log.1 | ||
| 69 | +sudo -u git -H gzip /home/git/gitlab-shell/gitlab-shell.log.1 | ||
| 70 | + | ||
| 67 | # Close access to gitlab-satellites for others | 71 | # Close access to gitlab-satellites for others |
| 68 | sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites | 72 | sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites |
| 69 | ``` | 73 | ``` |
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 | @@ -64,9 +64,6 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS | ||
| 64 | sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab | 64 | sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab |
| 65 | sudo chmod +x /etc/init.d/gitlab | 65 | sudo chmod +x /etc/init.d/gitlab |
| 66 | 66 | ||
| 67 | -# Update the logrotate configuration (keep logs for 90 days instead of 52 weeks) | ||
| 68 | -sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab | ||
| 69 | - | ||
| 70 | # Close access to gitlab-satellites for others | 67 | # Close access to gitlab-satellites for others |
| 71 | sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites | 68 | sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites |
| 72 | ``` | 69 | ``` |