API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 26th, 2015
112
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 18.06 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/gitlab/PKGBUILD b/gitlab/PKGBUILD
  2. index aabeef9..621ea2d 100644
  3. --- a/gitlab/PKGBUILD
  4. +++ b/gitlab/PKGBUILD
  5. @@ -5,60 +5,68 @@
  6. # Contributor: Stefan Tatschner <stefan@sevenbyte.org>
  7.  
  8. pkgname=gitlab
  9. -pkgver=7.13.4
  10. +pkgver=8.0.2
  11. pkgrel=1
  12. pkgdesc="Project management and code hosting application"
  13. arch=('i686' 'x86_64')
  14. url="http://gitlab.org/gitlab-ce"
  15. license=('MIT')
  16. -depends=('ruby>=2.0' 'git>=1.7.10' 'ruby-bundler>=1.5.2' 'gitlab-shell=2.6.3' 'openssh' 'redis>=2.0' 'libxslt' 'icu' 'nodejs')
  17. +depends=('ruby2.1' 'git>=1.7.10' 'ruby2.1-bundler>=1.5.2' 'gitlab-shell=2.6.5'
  18. + 'openssh' 'redis>=2.0' 'gmp' 'icu' 'keyutils' 'krb5' 'libgcrypt'
  19. + 'libgpg-error' 'libssh2' 'libxml2' 'libxslt' 'nodejs' 'openssl' 'xz'
  20. + 'zlib'
  21. + )
  22. makedepends=('cmake')
  23. optdepends=(
  24. - 'mariadb: database backend'
  25. - 'postgresql>=9.1: database backend'
  26. - 'python2-docutils: reStructuredText markup language support'
  27. - 'postfix: mail server in order to receive mail notifications'
  28. - )
  29. + 'mariadb: database backend'
  30. + 'postgresql>=9.1: database backend'
  31. + 'python2-docutils: reStructuredText markup language support'
  32. + 'postfix: mail server in order to receive mail notifications'
  33. + )
  34. backup=(
  35. - "etc/webapps/${pkgname}/application.rb"
  36. - "etc/webapps/${pkgname}/gitlab.yml"
  37. - "etc/webapps/${pkgname}/database.yml"
  38. - "etc/webapps/${pkgname}/resque.yml"
  39. - "etc/webapps/${pkgname}/unicorn.rb"
  40. - "etc/logrotate.d/${pkgname}"
  41. - )
  42. + "etc/webapps/${pkgname}/application.rb"
  43. + "etc/webapps/${pkgname}/gitlab.yml"
  44. + "etc/webapps/${pkgname}/database.yml"
  45. + "etc/webapps/${pkgname}/resque.yml"
  46. + "etc/webapps/${pkgname}/unicorn.rb"
  47. + "etc/logrotate.d/${pkgname}"
  48. + )
  49. +
  50. #source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/gitlab-org/gitlab-ce/repository/archive.tar.gz?ref=v${pkgver}"
  51. source=("$pkgname-$pkgver.tar.gz::https://github.com/gitlabhq/gitlabhq/archive/v${pkgver}.tar.gz"
  52. - gitlab-unicorn.service
  53. - gitlab-sidekiq.service
  54. - gitlab-backup.service
  55. - gitlab-backup.timer
  56. - gitlab.target
  57. - gitlab.tmpfiles.d
  58. - gitlab.logrotate
  59. - apache2.4.conf.example
  60. - apache2.4-ssl.conf.example
  61. - apache.conf.example
  62. - apache-ssl.conf.example
  63. - nginx.conf.example
  64. - nginx-ssl.conf.example
  65. - lighttpd.conf.example)
  66. + gitlab-unicorn.service
  67. + gitlab-sidekiq.service
  68. + gitlab-backup.service
  69. + gitlab-backup.timer
  70. + gitlab.target
  71. + gitlab.tmpfiles.d
  72. + gitlab.logrotate
  73. + apache2.4.conf.example
  74. + apache2.4-ssl.conf.example
  75. + apache.conf.example
  76. + apache-ssl.conf.example
  77. + lighttpd.conf.example
  78. + nginx.conf.example
  79. + nginx-ssl.conf.example
  80. + )
  81. +
  82. install='gitlab.install'
  83. -sha512sums=('ec4fa8ab4e8e853d515253ac2482756e4ecc8d5727a64f1644c427153e7cba78ef8cdc2d9214329207976c6d62c76993938cf8d114754c93e609f435768c6f99'
  84. - 'a16e762b0ff807e6e32ebf45562cf78b6b9b64babbfe4e42856a13f6e190c09553b74eb4d353d6213121c415cc08cc6cc82ffce56916208ebfd67b08cf012680'
  85. - '88132c32fddd067862b8d6973d3bfbb4fbd66aefc317ef8e030983709c939442a74de0d2ef80e55123837806531667ff5664e4b8d764d6bc1bc3a78a3fede249'
  86. - 'a38c9c55ad77d857b521769442db95706d9aaf238682f9aa17150f1b5f682ac68eaabfb116e49841e7fce628dd3589685b654d770ac067dac718b5f9e0ee6124'
  87. - 'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec'
  88. - 'c519a51d31300074ea12594fbcc8e9610d991ef04b1dac94d93a2b201df3465999cc7c6ac7f3896e02b117c2366d61dea1ef2f6b9cd7b18998385a7f26e5700f'
  89. - 'e5b8a659b9f0452c38f49a24579f1eac426b62a8ca66fe26b46134dcb0a6976e9597adb723c23728108da33e8e7f2cf80c9397d1fc15b6f71d60bc7aa9a7bc45'
  90. - 'a1f52d6ca36b32580062dede23ccdde5633238310b28c6c47deb2ce4496f4e5ffea0de2a49bcb1e0e38fc82b66b0cc91a5e86854716c7e848127769b43eb5067'
  91. - 'cd6b9cae3206dbaa3cd893ea0ead43ffbc70eb6a2ad4bacd3abab1150c751aa4ea64c9931409ac97ee36a2ae83fc019c8eb82b2fe11d5f5b4803a81fa5e79152'
  92. - 'cd563238011696ba4a7fa1eff2c6604bda8d75c3e6bf9ecb6f0f22e68c9d782e49be3ce2eaad0c1b142116e2c7c59c9242936ba5797f02d5d0880f7e3004aa99'
  93. - '2388bfd485bb2abaf08e28ed09848ba5dec7eac058836506d2f9f0954cfc75c71da062cc9b503f8f571cdda97c8a696f8aca20cca129ab5146c21b14e1e3ac61'
  94. - 'db768f60192f6adb466021776c3cdacc263954bc63dc0fb30d13ef20d4db2816d4d1875637984672373eb71c47e65bcdeac52ab5964796b6285519e9aa19c91b'
  95. - '5445f2d386ab18277772f42e175a4bf465dfcb448c0fa3d867302a5e018277438e295d238a62077c842b2c2225555b5b2f17a9194ab87e5d5c7e21e4e9c92366'
  96. - '78c90dc1a7ef969f6c94a004fa1038b6fb76b50c6f3de077b39d40e2a07550e274338d81e83e2280fbd8c2d66ece1706e44c78c785bbc029f9a8a79d3f1eb063'
  97. - 'c78b6f46abcf603d8db6e38cf50868e14145928422ddfe17c88e2f006b5b910dddf456ec5d6d724b250994530643963809688a98f7e12ebd5b5dabf7f96f0e06')
  98. +
  99. +sha512sums=('901d0841075514af6e5f1a5a1064f81347769d024b1d0a5527de069ba29de1746ec3c27045529acd7fd993ad53ea65a08d24f3fc3fcbb2fafebc4b7c75490f97'
  100. + 'a16e762b0ff807e6e32ebf45562cf78b6b9b64babbfe4e42856a13f6e190c09553b74eb4d353d6213121c415cc08cc6cc82ffce56916208ebfd67b08cf012680'
  101. + '88132c32fddd067862b8d6973d3bfbb4fbd66aefc317ef8e030983709c939442a74de0d2ef80e55123837806531667ff5664e4b8d764d6bc1bc3a78a3fede249'
  102. + '1127c268318a4b2af32aa19650064aae51276b3d620cf523dce10e9a4722d4932d4c8a17ab392c8c4c5f0acde523759f0d3d2e7ccf3c06cc53d6587aa5ad7e7c'
  103. + 'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec'
  104. + 'c519a51d31300074ea12594fbcc8e9610d991ef04b1dac94d93a2b201df3465999cc7c6ac7f3896e02b117c2366d61dea1ef2f6b9cd7b18998385a7f26e5700f'
  105. + '7a0f649f030b24315cc97f23b704dd1879274304706cf1a1fa125772803a6e918a2fa249bed229b9384552a572452c56379c50f46d2fa8aa999dc71c1ee047e0'
  106. + 'a1f52d6ca36b32580062dede23ccdde5633238310b28c6c47deb2ce4496f4e5ffea0de2a49bcb1e0e38fc82b66b0cc91a5e86854716c7e848127769b43eb5067'
  107. + 'cd6b9cae3206dbaa3cd893ea0ead43ffbc70eb6a2ad4bacd3abab1150c751aa4ea64c9931409ac97ee36a2ae83fc019c8eb82b2fe11d5f5b4803a81fa5e79152'
  108. + 'cd563238011696ba4a7fa1eff2c6604bda8d75c3e6bf9ecb6f0f22e68c9d782e49be3ce2eaad0c1b142116e2c7c59c9242936ba5797f02d5d0880f7e3004aa99'
  109. + '2388bfd485bb2abaf08e28ed09848ba5dec7eac058836506d2f9f0954cfc75c71da062cc9b503f8f571cdda97c8a696f8aca20cca129ab5146c21b14e1e3ac61'
  110. + 'db768f60192f6adb466021776c3cdacc263954bc63dc0fb30d13ef20d4db2816d4d1875637984672373eb71c47e65bcdeac52ab5964796b6285519e9aa19c91b'
  111. + 'c78b6f46abcf603d8db6e38cf50868e14145928422ddfe17c88e2f006b5b910dddf456ec5d6d724b250994530643963809688a98f7e12ebd5b5dabf7f96f0e06'
  112. + '5445f2d386ab18277772f42e175a4bf465dfcb448c0fa3d867302a5e018277438e295d238a62077c842b2c2225555b5b2f17a9194ab87e5d5c7e21e4e9c92366'
  113. + '78c90dc1a7ef969f6c94a004fa1038b6fb76b50c6f3de077b39d40e2a07550e274338d81e83e2280fbd8c2d66ece1706e44c78c785bbc029f9a8a79d3f1eb063')
  114.  
  115. _homedir="/var/lib/${pkgname}"
  116. _datadir="/usr/share/webapps/${pkgname}"
  117. @@ -68,124 +76,123 @@ _etcdir="/etc/webapps/${pkgname}"
  118. _wo=()
  119.  
  120. if [[ `pacman -T libmariadbclient` != '' ]]; then
  121. - _wo+=('mysql')
  122. + _wo+=('mysql')
  123. else
  124. warning "detected libmariadbclient"
  125. fi
  126. if [[ `pacman -T postgresql-libs` != '' ]]; then
  127. - _wo+=('postgres')
  128. + _wo+=('postgres')
  129. else
  130. warning "detected postgresql-libs"
  131. fi
  132.  
  133. prepare() {
  134. - if [[ ${#_wo[@]} == 2 ]]; then
  135. - error "Usable DB libs not found"
  136. - msg2 "Install at least libmariadbclient or postgresql-libs"
  137. - return 1
  138. - fi
  139. -
  140. - cd "${srcdir}/${_srcdir}"
  141. -
  142. - # Patching config files:
  143. - msg2 "Patching paths and username in gitlab.yml..."
  144. - sed -e "s|# user: git|user: gitlab|" \
  145. - -e "s|/home/git/repositories|${_homedir}/repositories|" \
  146. - -e "s|/home/git/gitlab-satellites|${_homedir}/satellites|" \
  147. - -e "s|/home/git/gitlab-shell|/usr/share/webapps/gitlab-shell|" \
  148. - -e "s|tmp/backups|${_homedir}/backups|" \
  149. - config/gitlab.yml.example > config/gitlab.yml
  150. - msg2 "Patching paths in unicorn.rb..."
  151. - sed -e "s|/home/git/gitlab/tmp/.*/|/run/gitlab/|g" \
  152. - -e "s|/var/run/|/run/|g" \
  153. - -e "s|/home/git/gitlab|${_datadir}|g" \
  154. - -e "s|timeout 30|timeout 300|" \
  155. - -e "s|${_datadir}/log/|${_logdir}/|g" \
  156. - config/unicorn.rb.example > config/unicorn.rb
  157. - msg2 "Patching username in database.yml..."
  158. - sed -e "s|username: git|username: gitlab|" \
  159. - config/database.yml.mysql > config/database.yml
  160. - sed -e "s|production: unix:/var/run/redis/redis.sock|production: redis://localhost:6379|" \
  161. - config/resque.yml.example > config/resque.yml
  162. - msg2 "setting up systemd service files ..."
  163. - for __srv in gitlab-sidekiq.service gitlab-unicorn.service gitlab.logrotate gitlab.tmpfiles.d gitlab-backup.service; do
  164. - sed -i "s|<HOMEDIR>|${_homedir}|g" "${srcdir}/${__srv}"
  165. - sed -i "s|<DATADIR>|${_datadir}|g" "${srcdir}/${__srv}"
  166. - sed -i "s|<LOGDIR>|${_logdir}|g" "${srcdir}/${__srv}"
  167. - done
  168. + if [[ ${#_wo[@]} == 2 ]]; then
  169. + error "Usable DB libs not found"
  170. + msg2 "Install at least libmariadbclient or postgresql-libs"
  171. + return 1
  172. + fi
  173. +
  174. + cd "${srcdir}/${_srcdir}"
  175. +
  176. + # Patching config files:
  177. + msg2 "Patching paths and username in gitlab.yml..."
  178. + sed -e "s|# user: git|user: gitlab|" \
  179. + -e "s|/home/git/repositories|${_homedir}/repositories|" \
  180. + -e "s|/home/git/gitlab-shell|/usr/share/webapps/gitlab-shell|" \
  181. + -e "s|tmp/backups|${_homedir}/backups|" \
  182. + config/gitlab.yml.example > config/gitlab.yml
  183. + msg2 "Patching paths in unicorn.rb..."
  184. + sed -e "s|/home/git/gitlab/tmp/.*/|/run/gitlab/|g" \
  185. + -e "s|/var/run/|/run/|g" \
  186. + -e "s|/home/git/gitlab|${_datadir}|g" \
  187. + -e "s|timeout 30|timeout 300|" \
  188. + -e "s|${_datadir}/log/|${_logdir}/|g" \
  189. + config/unicorn.rb.example > config/unicorn.rb
  190. + msg2 "Patching username in database.yml..."
  191. + sed -e "s|username: git|username: gitlab|" \
  192. + config/database.yml.mysql > config/database.yml
  193. + sed -e "s|production: unix:/var/run/redis/redis.sock|production: redis://localhost:6379|" \
  194. + config/resque.yml.example > config/resque.yml
  195. + msg2 "setting up systemd service files ..."
  196. + for __srv in gitlab-sidekiq.service gitlab-unicorn.service gitlab.logrotate gitlab.tmpfiles.d gitlab-backup.service; do
  197. + sed -i "s|<HOMEDIR>|${_homedir}|g" "${srcdir}/${__srv}"
  198. + sed -i "s|<DATADIR>|${_datadir}|g" "${srcdir}/${__srv}"
  199. + sed -i "s|<LOGDIR>|${_logdir}|g" "${srcdir}/${__srv}"
  200. + done
  201. }
  202.  
  203. build() {
  204. - cd "${srcdir}/${_srcdir}"
  205. -
  206. - msg "Fetching bundled gems..."
  207. - # Gems will be installed into vendor/bundle
  208. -
  209. - bundle config build.nokogiri --use-system-libraries
  210. - cpus=$(nproc)
  211. - if [[ $cpus -ge 3 ]]; then
  212. - bundle install -j$(( $cpus - 1 )) --no-cache --deployment --without development test aws ${_wo[@]}
  213. - else
  214. - bundle install --no-cache --deployment --without development test aws ${_wo[@]}
  215. - fi
  216. + cd "${srcdir}/${_srcdir}"
  217. +
  218. + msg "Fetching bundled gems..."
  219. + # Gems will be installed into vendor/bundle
  220. +
  221. + bundle-2.1 config build.nokogiri --use-system-libraries
  222. + cpus=$(nproc)
  223. + if [[ $cpus -ge 3 ]]; then
  224. + bundle-2.1 install -j$(( $cpus - 1 )) --no-cache --deployment --without development test aws ${_wo[@]}
  225. + else
  226. + bundle-2.1 install --no-cache --deployment --without development test aws ${_wo[@]}
  227. + fi
  228. }
  229.  
  230. package() {
  231. - cd "${srcdir}/${_srcdir}"
  232. - install -d "${pkgdir}/usr/share/webapps"
  233. - cp -r "${srcdir}/${_srcdir}" "${pkgdir}${_datadir}"
  234. -
  235. - # Creating directories
  236. - install -d \
  237. - "${pkgdir}${_etcdir}" \
  238. - "${pkgdir}/usr/share/doc/${pkgname}" \
  239. - "${pkgdir}${_homedir}/www" \
  240. - "${pkgdir}${_homedir}/satellites" \
  241. - "${pkgdir}${_datadir}/www" \
  242. - "${pkgdir}${_datadir}/public/uploads"
  243. - ln -fs /run/gitlab "${pkgdir}${_homedir}/pids"
  244. - ln -fs /run/gitlab "${pkgdir}${_homedir}/sockets"
  245. - ln -fs ${_datadir}/log "${pkgdir}${_homedir}/log"
  246. -
  247. - ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.secret"
  248. -
  249. - rm -rf "${pkgdir}${_datadir}/public/uploads" && ln -fs "${_homedir}/uploads" "${pkgdir}${_datadir}/public/uploads"
  250. - rm -rf "${pkgdir}${_datadir}/public/assets" && ln -fs "${_homedir}/assets" "${pkgdir}${_datadir}/public/assets"
  251. - # We are using PrivateTmp=true to start unicorn, so this is safe:
  252. - rm -rf "${pkgdir}${_datadir}/tmp" && ln -fs /var/tmp "${pkgdir}${_datadir}/tmp"
  253. - rm -rf "${pkgdir}${_datadir}/log" && ln -fs "${_logdir}" "${pkgdir}${_datadir}/log"
  254. -
  255. - ln -fs /etc/webapps/gitlab-shell/secret "${pkgdir}${_datadir}/.gitlab_shell_secret"
  256. -
  257. - # Install config files
  258. - for _file in application.rb gitlab.yml unicorn.rb database.yml resque.yml; do
  259. - mv "config/${_file}" "${pkgdir}${_etcdir}/"
  260. - [[ -f "${pkgdir}${_datadir}/config/${_file}" ]] && rm "${pkgdir}${_datadir}/config/${_file}"
  261. - ln -fs "${_etcdir}/${_file}" "${pkgdir}${_datadir}/config/"
  262. - done
  263. -
  264. - # Install license and help files
  265. - mv README.md MAINTENANCE.md CONTRIBUTING.md CHANGELOG config/*.{example,mysql,postgresql} "${pkgdir}/usr/share/doc/${pkgname}"
  266. - install -D "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
  267. - rm "${pkgdir}${_datadir}/LICENSE"
  268. -
  269. - # https://gitlab.com/gitlab-org/gitlab-ce/issues/765
  270. - cp -r "${pkgdir}${_datadir}/doc" "${pkgdir}${_datadir}/public/help"
  271. - find "${pkgdir}${_datadir}/public/help" -name "*.md" -exec rm {} \;
  272. - find "${pkgdir}${_datadir}/public/help/" -depth -type d -empty -exec rmdir {} \;
  273. -
  274. - # Install systemd service files
  275. - for _file in gitlab-unicorn.service gitlab-sidekiq.service gitlab-backup.service gitlab-backup.timer gitlab.target; do
  276. - install -Dm0644 "${srcdir}/${_file}" "${pkgdir}/usr/lib/systemd/system/${_file}"
  277. - done
  278. -
  279. - install -Dm644 "${srcdir}/gitlab.tmpfiles.d" "${pkgdir}/usr/lib/tmpfiles.d/gitlab.conf"
  280. - install -Dm644 "${srcdir}/gitlab.logrotate" "${pkgdir}/etc/logrotate.d/gitlab"
  281. -
  282. - # Install webserver config templates
  283. - for __cfg in apache2.4 apache2.4-ssl apache apache-ssl nginx nginx-ssl lighttpd; do
  284. - install -m644 "${srcdir}/${__cfg}.conf.example" "${pkgdir}${_etcdir}"
  285. - done
  286. + cd "${srcdir}/${_srcdir}"
  287. + install -d "${pkgdir}/usr/share/webapps"
  288. + cp -r "${srcdir}/${_srcdir}" "${pkgdir}${_datadir}"
  289. +
  290. + # Creating directories
  291. + install -d \
  292. + "${pkgdir}${_etcdir}" \
  293. + "${pkgdir}/usr/share/doc/${pkgname}" \
  294. + "${pkgdir}${_homedir}/www" \
  295. + "${pkgdir}${_homedir}/satellites" \
  296. + "${pkgdir}${_datadir}/www" \
  297. + "${pkgdir}${_datadir}/public/uploads"
  298. + ln -fs /run/gitlab "${pkgdir}${_homedir}/pids"
  299. + ln -fs /run/gitlab "${pkgdir}${_homedir}/sockets"
  300. + ln -fs ${_datadir}/log "${pkgdir}${_homedir}/log"
  301. +
  302. + ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.secret"
  303. +
  304. + rm -rf "${pkgdir}${_datadir}/public/uploads" && ln -fs "${_homedir}/uploads" "${pkgdir}${_datadir}/public/uploads"
  305. + rm -rf "${pkgdir}${_datadir}/public/assets" && ln -fs "${_homedir}/assets" "${pkgdir}${_datadir}/public/assets"
  306. + # We are using PrivateTmp=true to start unicorn, so this is safe:
  307. + rm -rf "${pkgdir}${_datadir}/tmp" && ln -fs /var/tmp "${pkgdir}${_datadir}/tmp"
  308. + rm -rf "${pkgdir}${_datadir}/log" && ln -fs "${_logdir}" "${pkgdir}${_datadir}/log"
  309. +
  310. + ln -fs /etc/webapps/gitlab-shell/secret "${pkgdir}${_datadir}/.gitlab_shell_secret"
  311. +
  312. + # Install config files
  313. + for _file in application.rb gitlab.yml unicorn.rb database.yml resque.yml; do
  314. + mv "config/${_file}" "${pkgdir}${_etcdir}/"
  315. + [[ -f "${pkgdir}${_datadir}/config/${_file}" ]] && rm "${pkgdir}${_datadir}/config/${_file}"
  316. + ln -fs "${_etcdir}/${_file}" "${pkgdir}${_datadir}/config/"
  317. + done
  318. +
  319. + # Install license and help files
  320. + mv README.md MAINTENANCE.md CONTRIBUTING.md CHANGELOG config/*.{example,mysql,postgresql} "${pkgdir}/usr/share/doc/${pkgname}"
  321. + install -D "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
  322. + rm "${pkgdir}${_datadir}/LICENSE"
  323. +
  324. + # https://gitlab.com/gitlab-org/gitlab-ce/issues/765
  325. + cp -r "${pkgdir}${_datadir}/doc" "${pkgdir}${_datadir}/public/help"
  326. + find "${pkgdir}${_datadir}/public/help" -name "*.md" -exec rm {} \;
  327. + find "${pkgdir}${_datadir}/public/help/" -depth -type d -empty -exec rmdir {} \;
  328. +
  329. + # Install systemd service files
  330. + for _file in gitlab-unicorn.service gitlab-sidekiq.service gitlab-backup.service gitlab-backup.timer gitlab.target; do
  331. + install -Dm0644 "${srcdir}/${_file}" "${pkgdir}/usr/lib/systemd/system/${_file}"
  332. + done
  333. +
  334. + install -Dm644 "${srcdir}/gitlab.tmpfiles.d" "${pkgdir}/usr/lib/tmpfiles.d/gitlab.conf"
  335. + install -Dm644 "${srcdir}/gitlab.logrotate" "${pkgdir}/etc/logrotate.d/gitlab"
  336. +
  337. + # Install webserver config templates
  338. + for __cfg in apache2.4 apache2.4-ssl apache apache-ssl nginx nginx-ssl lighttpd; do
  339. + install -m644 "${srcdir}/${__cfg}.conf.example" "${pkgdir}${_etcdir}"
  340. + done
  341. }
  342.  
  343. # vim:set ts=4 sw=4 et:
  344. diff --git a/gitlab/gitlab-backup.service b/gitlab/gitlab-backup.service
  345. index ffaa7f3..73405bb 100644
  346. --- a/gitlab/gitlab-backup.service
  347. +++ b/gitlab/gitlab-backup.service
  348. @@ -9,7 +9,7 @@ User=gitlab
  349. Group=gitlab
  350. SyslogIdentifier=gitlab-backup
  351. WorkingDirectory=<DATADIR>
  352. -Environment=RAILS_ENV=production
  353. +Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
  354.  
  355. CapabilityBoundingSet=
  356. PrivateTmp=true
  357. @@ -18,4 +18,4 @@ ProtectSystem=full
  358. ProtectHome=true
  359. NoNewPrivileges=true
  360.  
  361. -ExecStart=/usr/bin/bundle exec rake gitlab:backup:create
  362. \ No newline at end of file
  363. +ExecStart=/usr/bin/bundle-2.1 exec rake gitlab:backup:create
  364. diff --git a/gitlab/gitlab.tmpfiles.d b/gitlab/gitlab.tmpfiles.d
  365. index b64639b..9131275 100644
  366. --- a/gitlab/gitlab.tmpfiles.d
  367. +++ b/gitlab/gitlab.tmpfiles.d
  368. @@ -1,4 +1,3 @@
  369. -d /run/gitlab 0755 gitlab gitlab -
  370. d <HOMEDIR>/uploads 0775 gitlab gitlab -
  371. d <HOMEDIR>/assets 0775 gitlab gitlab -
  372. d <HOMEDIR>/backups 0770 gitlab gitlab -
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!