Merge branch 'feature/gitlab-mailroom' into 'master'

added support for gitlab-mailroom in the init-scripts / service files. not tested yet.



See merge request !5

www-apps/gitlabhq/Manifest

@@ -1,8 +1,9 @@
 AUX gitlab-git-http.service 972 SHA256 752e1b62a6c182d69b097788d4c21672655af92f150aa5ee416efab67c869f28 SHA512 ba6feefd2741fe97c176e00fbbb802fb4bfc9fc71b2d584c3ad44a312f2b01c9fe92d268d26ab18cb9372ad8616a5ca1554f2895297a17d35f6818bd27b8244b WHIRLPOOL c7c7fa598f2bae6f736a5f84aa3e737dd3b3bce8803128b0b17a8375e4e0c528b95bcd88b959c5bb9bd5ca1fd73330170be6fe2680c1a14702073d3c1c15f265
+AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208
 AUX gitlab-sidekiq-8.init 995 SHA256 179f8f9267f8358827c4c70697bf27dac728451ac7b9dbe0637d397850260fc2 SHA512 fca6c3b86788113f50120ada81859535bcdd3524ebf79e495c532049a5e1cb09b44499268b22610707ea4763bd6b380fe8abfad10520cd17b03802264c34f0bc WHIRLPOOL edc9c083447662bebdde5b0bbb97816f15a3122aa5cae966d1df805aac5a81e51a608cb5447283bda222af3bd28519b653a6ca6b34d1eef84abc37fd719e5955
 AUX gitlab-sidekiq.init 972 SHA256 614b405d16e2042d013dae510796620d42461512705fad2a90a7f558e0051c33 SHA512 afd3837ae660d47297c6d65180ae5f3ec6a15c1c8ea23aa5b715ca2fc5b628f3d868adf265c16521e940e5aeb53e4a70a2ec6c0acfacb6b39a1fb5bc669672fd WHIRLPOOL 434ae6e789fc8894a9c83bd538de804784c23072129c79fe0c209848e0c8e1a3d607ce9f7f9da617a25c874ce81d276d010d5ae2d3bf95e25034e9048cbd747a
 AUX gitlab-sidekiq.service 1066 SHA256 b9a15ee7498cc5ebecfd51a037ab1e32e66723a1612d5ce9365eefd890b5670e SHA512 33ece22389637b7b4591f4dceedb488fb43a92ca47facb19432f87772bbbf1774d4fb737ace52a6d55533c9e291e343dc56971c6f70fed285a10429d6d97d318 WHIRLPOOL b5a81751b8317bb9244018f9ed82f9793734adbad9983c244429a33d710169eeeed25cdf868d724032866d83bb9676ccbbf616b53363491e15a80e474443f331
-AUX gitlab-unicorn-8.init 1680 SHA256 c74c6db7c7bbce85df66648e20c11215917041577733454c6590dff3aacf7362 SHA512 44461e070b19abb1ddfa297aa995b04412cd367fb252591a7faf871f958e78c92955c78ba51137fcd1933dce896a9d05efdf06cabbf2cbe86e138fb12ead1bdb WHIRLPOOL 313548a006a3431e8116edbf3d0ce8613a9e65e3725ba4fb3683e95ebf2b2afac3801900d372839e6dc9a0004d805b98889c47292e8622e918c73a3a5e2fc0de
+AUX gitlab-unicorn-8.init 2556 SHA256 60c9e22f50641020702a8945b5d86ab016b567acd7343aa4ab0f8c97b26b5ca0 SHA512 83bd97aba27ee06bd179a76be565116ab794de029278d1e3cb749b9e3d49d38413a668c12c5972362cc87413d87840d026801fc6717241117f9a54abb16444d1 WHIRLPOOL 78e02983ec8ec7f2e37366910e1d1d813bd90f3c32c43dddd12b78442ba3e584463d019347bde99e6e57814e9af631cc1c20e1333a5bbc876037f10e3bef8b64
 AUX gitlab-unicorn.init 1657 SHA256 5fe794938b27d25488affc174e4761f5a3a1f9b15489a05f3839b13e4fd5b5ef SHA512 5e005ec26151afb4cdc8eb83592fad6814bb2a3ac8e9f642de83e70cd8615bdf969803a2479f8f72a70e0ae5ab5559da205965b55b3b4cdfdc9aa74055eef6fe WHIRLPOOL 6c61db597311ac618822fb22d7f51c830e5c011ce8e4c790338b3203a4483f3dd121bbd9cc33d7e1f92a2b0527e59816742f8ef0fd531c4c28c36d886fc94196
 AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792
 AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9
@@ -19,7 +20,6 @@ EBUILD gitlabhq-8.0.2.ebuild 11109 SHA256 802e5ec6fdc8a2219d8f812b0541916807fe07
 EBUILD gitlabhq-8.0.3.ebuild 11116 SHA256 7e5335681c66070aacecb1d64f58ef09e8cbd1934e8f7bea4d457c380fbe5029 SHA512 9c77b4ec65ccae2451f47fa50c443e3f6647268f8d6570e9c4f6ced1dfe881ff9f385404545c2db02f93eda8adba898a12eac27276f216da2dea2a164b27b6cd WHIRLPOOL 1bc6d1e7e6d89f03fec11696a905ac26792acc6be2115b348090d499c2dfdeb9cc1db8f257af316d38de6a770e9ebba2a5e6c529013a35f75863a56751a24c2b
 EBUILD gitlabhq-8.0.4-r1.ebuild 11192 SHA256 3f4ec010d0d19d331921ceaf49ed197d0ed359cdebc49e44edfcd135ef837ae6 SHA512 f916c54d3891568361aadddf5827e4f631af84e4534399e3e98ec7456d2554d3d817527ee5dd043ab658fc17ee65f91337ad8aa115937b4451afa8f22a15ad66 WHIRLPOOL 5afbebf340525ee64ec8e15f8a6142abe7873d14e09f16cac3a2f0706e3fdf993e39d76c3931d8cecc379aacd28162e7db38e822bc9bd403e84a37653f4b9abc
 EBUILD gitlabhq-8.0.4.ebuild 11116 SHA256 7e5335681c66070aacecb1d64f58ef09e8cbd1934e8f7bea4d457c380fbe5029 SHA512 9c77b4ec65ccae2451f47fa50c443e3f6647268f8d6570e9c4f6ced1dfe881ff9f385404545c2db02f93eda8adba898a12eac27276f216da2dea2a164b27b6cd WHIRLPOOL 1bc6d1e7e6d89f03fec11696a905ac26792acc6be2115b348090d499c2dfdeb9cc1db8f257af316d38de6a770e9ebba2a5e6c529013a35f75863a56751a24c2b
-EBUILD gitlabhq-8.0.5.ebuild 11179 SHA256 9bda7c4e16f049eba1a2cdc8cb269891ca2759bc530ba0e1d1e76e79dec00bf8 SHA512 1e2c9bc26c98ffde2fd22a482d50c29b7b1c169ba62bdbbf2a6f8007bf77428b2282e076d9431e537d7ae31e70f98cac99e884336942bd3555ea346816c275d4 WHIRLPOOL 49219725b625dfedb6d918c98bfa3ca2cbeeef5851f03953d9fd34bee141f4a0eaf2f8262c42603e7b0f1408e3af6b5ffc56ff1764f6afe6217650fbc58ab378
+EBUILD gitlabhq-8.0.5.ebuild 11234 SHA256 297ccc9bfc1a4f06498a9ac1653caf445426e5605b79eab4bad0b0aa556b99fd SHA512 60d14b1c9726e8c3421e9aeaf46fff3180fed0bad951fa616d9591ca8739f98e0fef7823b74fa52e9f2303f462a18a283314a80f3657858893ee7e2a628bcb5f WHIRLPOOL e0b35b857cab028cccb475af879b53c00c01a22f1bbd718dc498a0475e2baa68b71f15769c5ceab89f2a5ddac5aff2cc1e80dbb99e30ca9c05eae4b32ecea2ae
 EBUILD gitlabhq-9999.ebuild 11087 SHA256 565d2f2a530d232bed74ab7c9699788e186d69159e5b201a2b9e9990f558083d SHA512 c8eb9b1a667e78404949835ef92d8ca9ef74738379a0b2de9d64ce3dc0510635f575d43fc13efc52076afd8b85a3955e8614a41503e6ca1deb0847d1f23c2ad2 WHIRLPOOL a9889adc7f162bfc032914252f4f689e417e06b06149695f2f370daa7806bc33ccba6a2767f79d512cd9cc7dcbd8ffbfbdb2a71ec40cb16c2dfbec4900804dc6
-MISC Manifest.orig 11464 SHA256 1d619097e0316f2e1de8f3a79b89c1f0ae7fcdcd779269347b0875a30cab5dd7 SHA512 b527ca3dae3b3cac0ab471339549a784899346a14f7598866a93ef21a56df5a8addec2ff2b7ff2bfb2dc10f7b9a5d668b7c076e5855286326c32860ef2a6f167 WHIRLPOOL 14dd65cdf02ab3c345a5a8316edd348303cba0f586b75f23e369e92e2ec336077490d79d5e3c01f88f592ab6eb1419185e183e4edee5288b04eaeb839eee2630
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

www-apps/gitlabhq/files/gitlab-mailroom.service

@@ -0,0 +1,28 @@
+#####################################################
+#
+# GitLab version    : 8.x - 8.x
+# Contributors      : davispuh, mtorromeo, axilleas, boeserwolf91, Stefan Tatschner (rumpelsepp)
+# Downloaded from   : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd
+#
+####################################################
+
+[Unit]
+Description=Gitlab mailroom Worker
+Requires=gitlab-unicorn.service
+Wants=gitlab-unicorn.service
+After=gitlab-unicorn.service
+
+[Service]
+User=git
+Environment=RAILS_ENV=production
+WorkingDirectory=/opt/gitlab
+SyslogIdentifier=gitlab-mailroom
+PIDFile=/run/gitlab/gitlab-mailroom.pid
+Type=oneshot
+RemainAfterExit=yes
+
+ExecStart=/opt/gitlab/bin/mail_room start
+ExecStop=/opt/gitlab/bin/mail_room stop
+
+[Install]
+WantedBy=multi-user.target

www-apps/gitlabhq/files/gitlab-unicorn-8.init

@@ -13,12 +13,19 @@ description="GitLab on Unicorns"
 : ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
 : ${sidekiq_queues:="@QUEUES@"}
 
+: ${mail_room_pidfile:="/run/gitlab/mail_room.pid"}
+: ${mail_room_logfile:="/var/log/gitlab/mail_room.log"}
+: ${mail_room_config:="/etc/gitlab/mail_room.yml"}
+
 server_command="/usr/bin/bundle"
 server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D"
 
 sidekiq_command="/usr/bin/bundle"
 sidekiq_command_args="exec sidekiq -q ${sidekiq_queues//,/ -q } -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
 
+mail_room_command="/usr/bin/bundle"
+mail_room_command_args="exec mail_room -q -c ${mail_room_config} >> ${mail_room_logfile} 2>&1"
+
 depend() {
 	provide gitlab
 	need redis
@@ -49,9 +56,32 @@ start() {
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
+
+	if [ -e /etc/default/gitlab ]; then
+		. /etc/default/gitlab
+		if [ "${mail_room_enabled}" == "true" ]; then
+			ebegin "Starting ${name} - mail_room"
+
+			start-stop-daemon --start \
+				--background --quiet \
+				--chdir "${gitlab_base}" \
+				--user=${gitlab_user} \
+				--pidfile="${mail_room_pidfile}" \
+				--env RAILS_ENV=${rails_env} \
+				--exec ${mail_room_command} -- ${mail_room_command_args}
+			eend $?
+		fi
+	fi
 }
 
 stop() {
+	ebegin "Stopping ${name} - mail_room"
+	start-stop-daemon --stop \
+		--signal QUIT \
+		--pidfile=${mail_room_pidfile} \
+		--exec ${mail_room_command}
+	eend $?
+
 	ebegin "Stopping ${name} - Sidekiq"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \

www-apps/gitlabhq/gitlabhq-8.0.5.ebuild

@@ -210,6 +210,7 @@ all_ruby_install() {
 		systemd_dounit "${FILESDIR}/gitlab-sidekiq.service"
 		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
 		systemd_dounit "${FILESDIR}/gitlab-git-http.service"
+		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
 		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
 	else
 		local rcscript=gitlab-sidekiq-8.init