summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelvin Vermeeren <mail@mel.vin>2019-08-10 02:56:00 +0200
committerMelvin Vermeeren <mail@mel.vin>2019-08-10 02:56:41 +0200
commitcb7d41cc0f910088660eb876ac0e568145dd300c (patch)
tree265dc314f6d634b79140ca4abd83ecf00103fbee
parent87f98a33f0b86824a50328fb4d44489468a976a0 (diff)
update config to 1.7.0
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--config.cfg23
3 files changed, 24 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a34bed..ad94537 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = gitlab-pages
source = gitlab-pages.service
source = service.env
sha256sums = eda36763002b3fe54633c59d384f9840de38c6fc9008eb04cab25ae088d1d8f7
- sha256sums = 26f9ffde23377b0f83006f8441f31697acb15e0fabe1a63ae4c815faf544b6f2
+ sha256sums = 5e2135793d43ec2f3343b49cf45b00f44ef74e813c7d152d2e0ed46af5c25122
sha256sums = ae62235f0fd66eaed7ad74048daf21b92058aba90e40fc2d3e7a684e9883c32e
sha256sums = fd8f9b60e2247077ad00765904237b6b1c36b11a952cd3b1ad88e74417b82a96
diff --git a/PKGBUILD b/PKGBUILD
index 77fc12f..3482a81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ source=("$pkgname-v$pkgver.tar.gz::https://gitlab.com/gitlab-org/gitlab-pages/re
'service.env')
backup=('etc/gitlab-pages/config.cfg')
sha256sums=('eda36763002b3fe54633c59d384f9840de38c6fc9008eb04cab25ae088d1d8f7'
- '26f9ffde23377b0f83006f8441f31697acb15e0fabe1a63ae4c815faf544b6f2'
+ '5e2135793d43ec2f3343b49cf45b00f44ef74e813c7d152d2e0ed46af5c25122'
'ae62235f0fd66eaed7ad74048daf21b92058aba90e40fc2d3e7a684e9883c32e'
'fd8f9b60e2247077ad00765904237b6b1c36b11a952cd3b1ad88e74417b82a96')
diff --git a/config.cfg b/config.cfg
index 0a5b6a9..1901003 100644
--- a/config.cfg
+++ b/config.cfg
@@ -31,7 +31,7 @@
# Cookie store hash key, should be at least 32 bytes long.
#auth-secret=string
-# GitLab server, for example https://www.gitlab.com
+# DEPRECATED, use gitlab-server instead. GitLab server, for example https://www.gitlab.com
#auth-server=string
# Drop privileges to this group
@@ -48,6 +48,12 @@ daemon-uid=105
# Disable cross-origin requests
#disable-cross-origin-requests
+# GitLab server, for example https://www.gitlab.com
+#gitlab-server=string
+
+# Use default list of cipher suites, may contain insecure ones like 3DES and RC4
+#insecure-ciphers
+
# The address(es) to listen on for HTTP requests
#listen-http=value
@@ -88,5 +94,20 @@ pages-root=/var/lib/gitlab/shared/pages
# The default path to file certificate to serve static pages
#root-key=string
+# The address for sending sentry crash reporting to
+#sentry-dsn=string
+
+# The environment for sentry crash reporting
+#sentry-environment=string
+
+# Specifies the maximum SSL/TLS version, supported values are "ssl3", "tls1.0", "tls1.1", "tls1.2", "tls1.3"
+#tls-max-version=string
+
+# Specifies the minimum SSL/TLS version, supported values are "ssl3", "tls1.0", "tls1.1", "tls1.2", "tls1.3" (default "tls1.2")
+#tls-min-version=string
+
# Enable HTTP2 support (default true)
#use-http2
+
+# Show version
+#version