From bc99faba9d784b22820a41d8e7a522ccdef3bb89 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Mar 2017 02:41:24 +0100 Subject: [PATCH] www-servers/gitlab-pages: Fixed buggy configuration: - Logfile was not accessible - Init script didn't start nor stop the daemon correctly Package-Manager: portage-2.3.3 --- www-servers/gitlab-pages/ChangeLog | 5 +++++ www-servers/gitlab-pages/Manifest | 6 +++--- .../gitlab-pages/files/gitlab-pages-0.3.2.conf | 2 +- .../gitlab-pages/files/gitlab-pages-0.3.2.init | 11 ++++++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/www-servers/gitlab-pages/ChangeLog b/www-servers/gitlab-pages/ChangeLog index 2a37557..15edd0b 100644 --- a/www-servers/gitlab-pages/ChangeLog +++ b/www-servers/gitlab-pages/ChangeLog @@ -1,3 +1,8 @@ + 07 Mar 2017; Manuel Friedli + files/gitlab-pages-0.3.2.conf, files/gitlab-pages-0.3.2.init: + www-servers/gitlab-pages: Fixed buggy configuration: - Logfile was not + accessible - Init script didn't start nor stop the daemon correctly + 07 Mar 2017; Manuel Friedli gitlab-pages-0.3.2.ebuild: www-servers/gitlab-pages: Fixed the creation ofthe new user (syntax). diff --git a/www-servers/gitlab-pages/Manifest b/www-servers/gitlab-pages/Manifest index 592e3f7..2fc3684 100644 --- a/www-servers/gitlab-pages/Manifest +++ b/www-servers/gitlab-pages/Manifest @@ -1,7 +1,7 @@ AUX 0001-fix-Makefile-0.3.2.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3 -AUX gitlab-pages-0.3.2.conf 155 SHA256 9a503733141c5dc7d9308ddb6b246c884e5b3e0096f78ada33efe105b2f4de1e SHA512 707fcd2c1b9dd3a42c81ce7d4c9e1368bd582e0f737d599b78dedf8ae689dfccd288788d33cd39e87eb18afb578f86c97f1b4ab54882a85b7e00ccc98e8d470a WHIRLPOOL ea5a3609f0b8150884c9d5a28720eac49eae3c07cc791f4b5ca506a7ebbc4802d94ee80fe735d9f95b17ee488bad0c7edf009d8ce220715922e57a32ea93297d -AUX gitlab-pages-0.3.2.init 589 SHA256 e211be50e4d7c192b13c68dd242575a0bb420282a2a14d2a10e3160b1e48062f SHA512 4b16d385425f655301df5af9108cfe05d2043a43b56b67de659dfd2d32b90de8516d12af4945ed7852f5677cbbc56d2372675fc28ea34c934861f15b7a80569e WHIRLPOOL 80c10e6263964fc8aedf8203e9dd6d5079cba59432d4fecfb034ba79ee30eabd357527573db6a26d863fd03f4dc76a25d160bbb85d60f63609ba883f09679af3 +AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7159683ebf42f3a28d41a473 SHA512 57ff7ef4f3c5f221e39f8cfd29ab58ccb126d672260ee983d6f1221bfe2cfe5553b4f0187ce384f05fc6694ad31c2f7ae02155d0c21247eccd1d7dbf1632ffba WHIRLPOOL 1cb70bb5a9e6876a58e7cf78a68e9a08a0ae947237a537f7cf93b727cdb69482114cd2c1ccd17e27b80590be11e9904bae81e06afab83066c0d10926d22dd301 +AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0 DIST gitlab-pages-0.3.2.tar.bz2 205531 SHA256 392b0620871ab36a362f8b8b9008c266eda465e6f32611ccbdbe640cd77ae7b5 SHA512 e452af8a9d2032ccba827a7a165abf324008c585369f74d14a47524eaaa3255a92c38f102e8cf63a86012650da6265aa1a28f0ade5131ebb1df51e6202be0edc WHIRLPOOL d47459d214d1ed9818de534885ea806f092fe2fb02b2aa08b00b95fb9c3f2693b7c9b8d3e5723be55535888e1276ba4dbc24ead2f659677a43d326dcff9f3925 EBUILD gitlab-pages-0.3.2.ebuild 1951 SHA256 c3617997d32d94ac44131e048a71f9e99db0243223f3158089154317cb4a3fc6 SHA512 123890a3c2c24d45be2a0e5d5042d8b3fe95fc6a7a51d447056fc08363a4414e47624b9c0744cba922f642fec3cc35952efdfc43bc4c5cbaac24deeb8554b3e1 WHIRLPOOL 7e09a647a1748c41da4120fdf8fd66bdd0a0adbc09a7462ffc7e3c9e5fdadf9036fa27c48272baef45d23977bf004df712aa3b4f11ecee113c4ffc306acbcc18 -MISC ChangeLog 454 SHA256 dffff5f9435dedd963cb6a580829a03a7e16fce2887e89f2896a6894f18e7fe2 SHA512 e77ff79e0f7c246956871b70ce4573cecf810bb9d1d892de5496555c9e5a2f98e916128a9a8ab187f78736cc26ee4ca8030903617aa9f24d80d025bbca8ed095 WHIRLPOOL e644a687ec06b8b453c4dc79e81e4f0885f46271ab870b320bd3c8427ba7681ab498f74251cc467f2bced362e577661719aee52958012128bf6be115f577c129 +MISC ChangeLog 715 SHA256 1cdc53deb505288e62b3b1fd7f26259ebd5462e6fdc6fc0bff46a41b91d028e7 SHA512 786edeb0f99dfe9a1e604970961ff3bc8f55ddab5621d9c9d3decc8397af5c30d207ea3f432e3b944776913b30fe25fcb986d77df58ea346fd4a86d5684e5977 WHIRLPOOL 7f9bcd41be0149d7f3858c0978dc5ca3d9dc264ec9f6d799351e8bd982e7d7e4f6a2d175d3469f2551fdcaee424a3e1e19a615b4f31b04466e2a3c25e4e3c095 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.conf b/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.conf index 0155c19..21678d9 100644 --- a/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.conf +++ b/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.conf @@ -4,4 +4,4 @@ LISTEN_PROXY= PAGES_DOMAIN=example-pages.com PAGES_ROOT=/opt/gitlab/shared/pages -LOGFILE=/var/log/gitlab/gitlab-pages.log +LOGFILE=/var/log/gitlab-pages.log diff --git a/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.init b/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.init index c6f90b4..e4ee9ed 100644 --- a/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.init +++ b/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.init @@ -2,15 +2,20 @@ start() { ebegin "Starting gitlab-pages" + + checkpath -f -m 0640 -o @USER@:@USER@ /var/log/gitlab-pages.log + start-stop-daemon --start --exec /usr/bin/gitlab-pages --pidfile /run/gitlab-pages.pid \ --make-pidfile --background --user @USER@:@USER@ --stdout "${LOGFILE}" --stderr "${LOGFILE}" \ - -- -listen-http "${LISTEN_HTTP}" -listen-https "${LISTEN_HTTPS}" -listen-proxy "${LISTEN_PROXY}" \ + -- ${LISTEN_HTTP:+-listen-http }${LISTEN_HTTP} \ + ${LISTEN_HTTPS:+-listen-https }${LISTEN_HTTPS} \ + ${LISTEN_PROXY:+-listen-proxy }${LISTEN_PROXY} \ -pages-domain "${PAGES_DOMAIN}" -pages-root "${PAGES_ROOT}" eend $? } stop() { - ebegin "Stopping gitlab-workhorse" - start-stop-daemon --stop --exec /usr/bin/gitlab-pages --pidfile /run/gitlab-workhorse.pid --user @USER@:@USER@ + ebegin "Stopping gitlab-pages" + start-stop-daemon --stop --exec /usr/bin/gitlab-pages --pidfile /run/gitlab-pages.pid --user @USER@:@USER@ eend $? }