Merge branch 'fix-redis-config-path' into 'master'

fixed path to the redis_config file



See merge request !55

www-apps/gitlab-ce/Manifest

@@ -1,3 +1,4 @@
+AUX gitlab-ce-fix-redis-config-path.patch 809 SHA256 10518b34b43b934f60f4b4d36c3570d75e62f7cd4fe84a720c93d952eb739566 SHA512 9e3a607ebebdd2b2ba33835facb185217ff3b7c1930a748598419f0a7f2f49d01a73071984ccb6e46ee3333cd654b6fc189bc04346b49544a108d49fec18beeb WHIRLPOOL b015028fffce5f0e97a273e6578e5d34a034cafb65a0518a6664a60a571dee89d99fc2f776069653046e7c01d3f786201b31cd04d1ba606dd30108b4c07cceb3
 AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208
 AUX gitlab-sidekiq.init 989 SHA256 72f9acb269b2e60f7571b2c658f7f29e9c36c6987c9fc8f1d02b9a1bae8ba747 SHA512 cc6ab63f238507bb4a66f48f8df487a8c493afc0e0433ed82c09a7b6dec984a45f465c526cf7be70f485222607af0baa04e7057183f16badcf04950b43fc02f8 WHIRLPOOL 0cda6727f0f0a7a15eb4476c9d651fb5aa6f7ccf9c23a24d040576309c8a30aa6e1790974c82de9656f316c2d9beaf0d1fdd100cab1b7ac7f8cebf2079a13dbe
@@ -9,6 +10,6 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1
 DIST gitlab-ce-8.5.8.tar.gz 15180480 SHA256 dd531c7b62a6b3b2377ec79f0735f83cdb379868f4ae24befd10f13797a80c7e SHA512 8a44c8c1dd13a8ba8452cdaef68978a2557f7c47cbeab37fb67c3616ec041b50bf2b02ece8e4c66222b4f705b59ad80c9ee46284f03d6adffc193d3eb9e74d38 WHIRLPOOL 710d11dd0c309a29e241989be310c82786b89b66f73e0e8d9431c6b3bbe161f725fad209c8cfd3f5cbcff91920c94ec857fb54b2ce4fc46c3ffe337935232e14
 DIST gitlab-ce-8.6.1.tar.gz 16086639 SHA256 ee0c9695ae3a58d186385b9295ed6be08ea03b94fd4fe1c1716ede0ab72052c8 SHA512 198ee12fbc0405014ca366ec4aac156aaabf09d8a284317a6f72930d3dc572da9d04556c1d512728549e5e7f4411b06c783ff7a85c4df64db514ed5ad7399e95 WHIRLPOOL 8909577f7d08aef1841663959fa2dc43d8cceb46f14e48cd1f89cc88a30547915516ab2f58260674ce94eb21b762f970d8b9eaf414abd864abde12d67f2f677b
 EBUILD gitlab-ce-8.5.8.ebuild 11796 SHA256 001317396732b276ee64682501b4d7a48a2710a14841f17f0721a43fe6ab6b50 SHA512 4fd18be998439a20b34239666edf25c3d25f0d84eca457c9f2f954966150fb916cb2690cc43b5a954875bf90b6aa578fd6ecfbe2c888c11e5ea82668ae04ef86 WHIRLPOOL c38f4d2d44fbc7944e872f4a2a06f0dbd2f4f712fc495e7e195a36e7d1f8d698c2645b3fa87287237e2debeaee5a1cc69a854b7ff0ff636a2166d0f0ea512f61
-EBUILD gitlab-ce-8.6.1.ebuild 12214 SHA256 78e12379fa4149baa48422679297157a3f2b418214045ede9e355168df4af388 SHA512 49600aaa3016a7a2768a55208cc4d206c6530a75771771aa563d2a64e11b6e6a94a114ba03cf45f800cf4a3683bdaf787d50908e40f3ff4801eb1fd5ed7466cf WHIRLPOOL 830b1557486d7684bc61aa3b21bdbf3c9a0f70e1063807ffbb203b913046c43e2d6cb276e15755da914034fa9983de7be41f53cef65e37b4d3eeeb25ab28c173
-EBUILD gitlab-ce-9999.ebuild 12218 SHA256 0f06480f201cb8a82deab6cc71ed8ad9425818d34cacbdd94417184d861f380b SHA512 fc7680b2247533e513582200b1d72218e7536677d90a02beeec26ea923fddeb3f8209d6c0e0bde4b1044775ba08da6b04ae2b98ffd4b34cacd52170d991191c5 WHIRLPOOL 06b64b03e62d86e41d432607262b4929068f0ac2be5f0ffe8d504336d3b5a91380283b1bb2b9336e3c78cb686ec2a7a98271243fabc4f42f5185e97412a4021f
+EBUILD gitlab-ce-8.6.1.ebuild 12332 SHA256 b87197de266e563287f5750aa65bd7c6ae945c90621d89851d563189f516ae6d SHA512 832e60f771e5476e7d8ca3d604161d37bb3559cf6755386a459ff1e5e3c7832f719411e0472c647cc2f68b55c4f9057acba24b9b3d5a4a34f28c1f05f42c312c WHIRLPOOL 870736d44f6f94050bd6f3453a069da0af4a51d6ac3dcac3bfd9a9e771bebe9bdd84cf17774add3d89684af4367151c07342794885484d4c4c09c2d0695b8959
+EBUILD gitlab-ce-9999.ebuild 12336 SHA256 31086d299eacd936c31f55058b45b0be0abfee2f32488252c8b4d3e36792235c SHA512 42d69391a918d834acd7607cd3f6f27c4ce202d2adf4e02bfd7bf285184b3a02e74ea402d712898b133bbdf7a290f1c9ff62fee759fdb4bdf083d7222088d957 WHIRLPOOL 24f9171e086d0bb1615002919271744f614a018531dd7673f849b0ba17bb86f63c9a3a47cf1cd0e1198234a5736fe9c1d8381bb78777d3ce0fed4562373620ba
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

www-apps/gitlab-ce/files/gitlab-ce-fix-redis-config-path.patch

@@ -0,0 +1,26 @@
+diff --git a/config/application.rb b/config/application.rb
+index 5a0ac70..5a2ab43 100644
+--- a/config/application.rb
++++ b/config/application.rb
+@@ -4,7 +4,7 @@ require 'rails/all'
+ require 'devise'
+ I18n.config.enforce_available_locales = false
+ Bundler.require(:default, Rails.env)
+-require_relative '../lib/gitlab/redis_config'
++require_relative '/opt/gitlab/lib/gitlab/redis_config'
+ 
+ module Gitlab
+   REDIS_CACHE_NAMESPACE = 'cache:gitlab'
+diff --git a/config/mail_room.yml b/config/mail_room.yml
+index aed55f7..dace83f 100644
+--- a/config/mail_room.yml
++++ b/config/mail_room.yml
+@@ -2,7 +2,7 @@
+ <%
+ require "yaml"
+ require "json"
+-require_relative "lib/gitlab/redis_config"
++require_relative "/opt/gitlab/lib/gitlab/redis_config"
+ 
+ rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+ 

www-apps/gitlab-ce/gitlab-ce-8.6.1.ebuild

@@ -73,9 +73,12 @@ ruby_add_bdepend "
 #
 # fix-sendmail-config:
 #     Fix default settings to work with ssmtp that doesn't know '-t' argument.
+# fix-redis-config-path:
+#     Point to the absolute location of redis_config.rb
 #
 RUBY_PATCHES=(
 	"${PN}-fix-sendmail-config.patch"
+	"${PN}-fix-redis-config-path.patch"
 )
 
 MY_NAME="gitlab"

www-apps/gitlab-ce/gitlab-ce-9999.ebuild

@@ -72,9 +72,12 @@ ruby_add_bdepend "
 #
 # fix-sendmail-config:
 #     Fix default settings to work with ssmtp that doesn't know '-t' argument.
+# fix-redis-config-path:
+#     Point to the absolute location of redis_config.rb
 #
 RUBY_PATCHES=(
 	"${PN}-fix-sendmail-config.patch"
+	"${PN}-fix-redis-config-path.patch"
 )
 
 MY_NAME="gitlab"