summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
-rw-r--r--config.cfg21
3 files changed, 29 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d17d62cc0d4e..880caacbd65e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Apr 28 19:11:45 UTC 2018
+# Sun Feb 3 21:55:22 UTC 2019
pkgbase = gitlab-pages
pkgdesc = GitLab Pages daemon used to serve static websites for GitLab users
- pkgver = 0.9.0
+ pkgver = 1.5.0
pkgrel = 1
url = https://gitlab.com/gitlab-org/gitlab-pages
arch = i686
@@ -10,12 +10,12 @@ pkgbase = gitlab-pages
license = MIT
makedepends = go
backup = etc/gitlab-pages/config.cfg
- source = gitlab-pages-v0.9.0.tar.gz::https://gitlab.com/gitlab-org/gitlab-pages/repository/v0.9.0/archive.tar.gz
+ source = gitlab-pages-v1.5.0.tar.gz::https://gitlab.com/gitlab-org/gitlab-pages/repository/v1.5.0/archive.tar.gz
source = config.cfg
source = gitlab-pages.service
source = service.env
- sha256sums = 90e3c873382e42caccce0f4ab1b1a3bfef510849500eab28409f72661a557e16
- sha256sums = 558e9f5ec85fbf4ef7380016e64bcf00f09498596044f76a8eb87b6ef4154ce4
+ sha256sums = 52af7ace4d5146738db30b5b5c9337059a0babca803468ccaf9fbf6e61de5e61
+ sha256sums = 26f9ffde23377b0f83006f8441f31697acb15e0fabe1a63ae4c815faf544b6f2
sha256sums = ae62235f0fd66eaed7ad74048daf21b92058aba90e40fc2d3e7a684e9883c32e
sha256sums = fd8f9b60e2247077ad00765904237b6b1c36b11a952cd3b1ad88e74417b82a96
diff --git a/PKGBUILD b/PKGBUILD
index c63d62efd5d7..cb0797356f0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Melvin Vermeeren <mail@mel.vin>
# Useful: https://gitlab.com/gitlab-org/gitlab-ce/issues/29963
pkgname=gitlab-pages
-pkgver=0.9.0
+pkgver=1.5.0
pkgrel=1
pkgdesc='GitLab Pages daemon used to serve static websites for GitLab users'
url='https://gitlab.com/gitlab-org/gitlab-pages'
@@ -14,8 +14,8 @@ source=("$pkgname-v$pkgver.tar.gz::https://gitlab.com/gitlab-org/gitlab-pages/re
'gitlab-pages.service'
'service.env')
backup=('etc/gitlab-pages/config.cfg')
-sha256sums=('90e3c873382e42caccce0f4ab1b1a3bfef510849500eab28409f72661a557e16'
- '558e9f5ec85fbf4ef7380016e64bcf00f09498596044f76a8eb87b6ef4154ce4'
+sha256sums=('52af7ace4d5146738db30b5b5c9337059a0babca803468ccaf9fbf6e61de5e61'
+ '26f9ffde23377b0f83006f8441f31697acb15e0fabe1a63ae4c815faf544b6f2'
'ae62235f0fd66eaed7ad74048daf21b92058aba90e40fc2d3e7a684e9883c32e'
'fd8f9b60e2247077ad00765904237b6b1c36b11a952cd3b1ad88e74417b82a96')
diff --git a/config.cfg b/config.cfg
index c8a377a1a82d..0a5b6a906810 100644
--- a/config.cfg
+++ b/config.cfg
@@ -19,10 +19,28 @@
# Timeout (in seconds) for a proxied request to the artifacts server (default 10)
#artifacts-server-timeout=int
+# GitLab application Client ID
+#auth-client-id=string
+
+# GitLab application Client Secret
+#auth-client-secret=string
+
+# GitLab application redirect URI
+#auth-redirect-uri=string
+
+# Cookie store hash key, should be at least 32 bytes long.
+#auth-secret=string
+
+# GitLab server, for example https://www.gitlab.com
+#auth-server=string
+
# Drop privileges to this group
# Arch: chroot to GitLab group by default
daemon-gid=105
+# Fall back to a non-bind-mount chroot of -pages-root when daemonizing
+#daemon-inplace-chroot
+
# Drop privileges to this user
# Arch: chroot to GitLab user by default
daemon-uid=105
@@ -45,6 +63,9 @@ daemon-uid=105
# Verbose logging
#log-verbose
+# Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners (default 5000)
+#max-conns=uint
+
# The address to listen on for metrics requests
#metrics-address=string