summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--gitlab-pages.service4
3 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 65d5bfba324a..503897ff9e85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gitlab-pages
pkgdesc = GitLab Pages daemon used to serve static websites for GitLab users
pkgver = 1.38.0
- pkgrel = 5
+ pkgrel = 6
url = https://gitlab.com/gitlab-org/gitlab-pages
arch = x86_64
arch = i686
@@ -13,7 +13,7 @@ pkgbase = gitlab-pages
source = gitlab-pages.service
source = service.env
sha256sums = 02b6d5329d62282e5caa31751c855af54456f363284dd467550a31ee864dd7bf
- sha256sums = ae62235f0fd66eaed7ad74048daf21b92058aba90e40fc2d3e7a684e9883c32e
+ sha256sums = df2bb3607f500daf95ac7c3ddf2470c794a72c66ba0770029753f859f1c53082
sha256sums = fd8f9b60e2247077ad00765904237b6b1c36b11a952cd3b1ad88e74417b82a96
pkgname = gitlab-pages
diff --git a/PKGBUILD b/PKGBUILD
index 137483529b64..3a8313485e58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gitlab-pages
pkgver=1.38.0
-pkgrel=5
+pkgrel=6
pkgdesc='GitLab Pages daemon used to serve static websites for GitLab users'
url="https://gitlab.com/gitlab-org/$pkgname"
license=('MIT')
@@ -16,7 +16,7 @@ source=("$url/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2"
backup=("etc/$pkgname/config.cfg"
"etc/$pkgname/service.env")
sha256sums=('02b6d5329d62282e5caa31751c855af54456f363284dd467550a31ee864dd7bf'
- 'ae62235f0fd66eaed7ad74048daf21b92058aba90e40fc2d3e7a684e9883c32e'
+ 'df2bb3607f500daf95ac7c3ddf2470c794a72c66ba0770029753f859f1c53082'
'fd8f9b60e2247077ad00765904237b6b1c36b11a952cd3b1ad88e74417b82a96')
build() {
@@ -31,7 +31,7 @@ build() {
-ldflags "-extldflags \"$LDFLAGS\" -X main.VERSION=$pkgver" \
.
./$pkgname -help 2>&1 |
- sed -ne '/=/{s/^ -//;s/\([^:]*\): \(.*\)/# \2\n#\1\n/;/config=/d;s/=""$/=string/;p}' |
+ sed -ne '/=/{s/^ -//;s/\([^:]*\): \(.*\)/# \2\n#\1\n/;/config=/d;s/=""/=string/;p}' |
sed -e '/daemon-.id=/{s/^#//;s/=0/=105/}' \
> config.cfg
}
diff --git a/gitlab-pages.service b/gitlab-pages.service
index 689e55396060..3e5f559bf972 100644
--- a/gitlab-pages.service
+++ b/gitlab-pages.service
@@ -15,8 +15,8 @@ ExecStart=/usr/bin/setpriv --inh-caps=-all --clear-groups \
/usr/bin/gitlab-pages -config /etc/gitlab-pages/config.cfg
Restart=always
RestartSec=120
-StandardOutput=syslog
-StandardError=syslog
+StandardOutput=journal
+StandardError=journal
SyslogIdentifier=gitlab-pages
PrivateTmp=true
ProtectSystem=full