From d3dbd353ccebb753e7791643312795ae27bb4c9d Mon Sep 17 00:00:00 2001 From: Daniel Widerin Date: Wed, 24 Sep 2014 10:48:33 +0000 Subject: [PATCH 1/6] Add unixsocketperm note to upgrade guide --- doc/update/7.2-to-7.3.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index 7cc9a5c21fb..942f9e9641f 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -72,6 +72,8 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab sed 's/^port .*/port 0/' /etc/redis/redis.conf.orig | sudo tee /etc/redis/redis.conf # Enable Redis socket for default Debian / Ubuntu path echo 'unixsocket /var/run/redis/redis.sock' | sudo tee -a /etc/redis/redis.conf + # Be sure redis group can write to the socket. + echo 'unixsocketperm 775' | sudo tee -a /etc/redis/redis.conf # Activate the changes to redis.conf sudo service redis-server restart # Add git to the redis group From 18adc4f67ddee72141ec9be5ebbe3923ec4f41e4 Mon Sep 17 00:00:00 2001 From: Daniel Widerin Date: Thu, 25 Sep 2014 11:09:46 +0000 Subject: [PATCH 2/6] Fix 'Invalid socket file permissions' error --- doc/update/7.2-to-7.3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index 942f9e9641f..5707d1930b6 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -73,7 +73,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab # Enable Redis socket for default Debian / Ubuntu path echo 'unixsocket /var/run/redis/redis.sock' | sudo tee -a /etc/redis/redis.conf # Be sure redis group can write to the socket. - echo 'unixsocketperm 775' | sudo tee -a /etc/redis/redis.conf + echo 'unixsocketperm 0775' | sudo tee -a /etc/redis/redis.conf # Activate the changes to redis.conf sudo service redis-server restart # Add git to the redis group From b874cb21ebf9653a0a15a43838bbb2ac5d37aaff Mon Sep 17 00:00:00 2001 From: Daniel Widerin Date: Thu, 25 Sep 2014 15:23:06 +0000 Subject: [PATCH 3/6] Use 'sed' with pre-search to enable only if present in redis config file. --- doc/update/7.2-to-7.3.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index 5707d1930b6..a763835e165 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -72,8 +72,9 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab sed 's/^port .*/port 0/' /etc/redis/redis.conf.orig | sudo tee /etc/redis/redis.conf # Enable Redis socket for default Debian / Ubuntu path echo 'unixsocket /var/run/redis/redis.sock' | sudo tee -a /etc/redis/redis.conf - # Be sure redis group can write to the socket. - echo 'unixsocketperm 0775' | sudo tee -a /etc/redis/redis.conf + # Be sure redis group can write to the socket, enable only if supported (>= redis 2.4.0). + sed '/# unixsocketperm/ s/^# unixsocketperm.*/unixsocketperm 0775/' /etc/redis.conf | sudo tee -a /etc/redis/redis.conf + echo ' 0775' | sudo tee -a /etc/redis/redis.conf # Activate the changes to redis.conf sudo service redis-server restart # Add git to the redis group From d5dc171cb7e04a1a513dca044578e95d52706a84 Mon Sep 17 00:00:00 2001 From: Daniel Widerin Date: Thu, 25 Sep 2014 15:23:40 +0000 Subject: [PATCH 4/6] Path on ubuntu is different --- doc/update/7.2-to-7.3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index a763835e165..ceb9588f758 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -73,7 +73,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab # Enable Redis socket for default Debian / Ubuntu path echo 'unixsocket /var/run/redis/redis.sock' | sudo tee -a /etc/redis/redis.conf # Be sure redis group can write to the socket, enable only if supported (>= redis 2.4.0). - sed '/# unixsocketperm/ s/^# unixsocketperm.*/unixsocketperm 0775/' /etc/redis.conf | sudo tee -a /etc/redis/redis.conf + sed '/# unixsocketperm/ s/^# unixsocketperm.*/unixsocketperm 0775/' /etc/redis/redis.conf | sudo tee -a /etc/redis/redis.conf echo ' 0775' | sudo tee -a /etc/redis/redis.conf # Activate the changes to redis.conf sudo service redis-server restart From 16a6d2450b5a5839c69c9d2365244f59bd17f1ac Mon Sep 17 00:00:00 2001 From: Daniel Widerin Date: Thu, 25 Sep 2014 15:24:56 +0000 Subject: [PATCH 5/6] Use edit in place with sed instead of tee --- doc/update/7.2-to-7.3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index ceb9588f758..b60947b5a62 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -73,7 +73,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab # Enable Redis socket for default Debian / Ubuntu path echo 'unixsocket /var/run/redis/redis.sock' | sudo tee -a /etc/redis/redis.conf # Be sure redis group can write to the socket, enable only if supported (>= redis 2.4.0). - sed '/# unixsocketperm/ s/^# unixsocketperm.*/unixsocketperm 0775/' /etc/redis/redis.conf | sudo tee -a /etc/redis/redis.conf + sed -i '/# unixsocketperm/ s/^# unixsocketperm.*/unixsocketperm 0775/' /etc/redis/redis.conf echo ' 0775' | sudo tee -a /etc/redis/redis.conf # Activate the changes to redis.conf sudo service redis-server restart From 99e5e6db73379190f2025daafe4bb5490f4bb360 Mon Sep 17 00:00:00 2001 From: Daniel Widerin Date: Thu, 25 Sep 2014 15:34:11 +0000 Subject: [PATCH 6/6] Remove obsolete line --- doc/update/7.2-to-7.3.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index b60947b5a62..94527c3dcac 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -74,7 +74,6 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab echo 'unixsocket /var/run/redis/redis.sock' | sudo tee -a /etc/redis/redis.conf # Be sure redis group can write to the socket, enable only if supported (>= redis 2.4.0). sed -i '/# unixsocketperm/ s/^# unixsocketperm.*/unixsocketperm 0775/' /etc/redis/redis.conf - echo ' 0775' | sudo tee -a /etc/redis/redis.conf # Activate the changes to redis.conf sudo service redis-server restart # Add git to the redis group