summaryrefslogtreecommitdiffstats
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/authority.conf6
-rw-r--r--distrib/gitblit.properties14
-rw-r--r--distrib/makekeystore.cmd2
-rw-r--r--distrib/makekeystore_jdk.cmd4
4 files changed, 23 insertions, 3 deletions
diff --git a/distrib/authority.conf b/distrib/authority.conf
new file mode 100644
index 00000000..3e62e3c3
--- /dev/null
+++ b/distrib/authority.conf
@@ -0,0 +1,6 @@
+[new]
+ duration = 365
+ organizationalUnit = Gitblit
+ organization = Gitblit
+ locality = Gitblit
+ stateProvince = NY
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 1562c513..9daabde4 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -1137,6 +1137,20 @@ server.ajpBindInterface = localhost
# RESTART REQUIRED
server.storePassword = gitblit
+# If serving over https (recommended) you might consider requiring clients to
+# authenticate with ssl certificates. If enabled, only https clients with the
+# a valid client certificate will be able to access Gitblit.
+#
+# If disabled, client certificate authentication is optional and will be tried
+# first before falling-back to form authentication or basic authentication.
+#
+# Requiring client certificates to access any of Gitblit may be too extreme,
+# consider this carefully.
+#
+# SINCE 1.2.0
+# RESTART REQUIRED
+server.requireClientCertificates = false
+
# Port for shutdown monitor to listen on.
#
# SINCE 0.5.0
diff --git a/distrib/makekeystore.cmd b/distrib/makekeystore.cmd
index b1413801..8a72e03b 100644
--- a/distrib/makekeystore.cmd
+++ b/distrib/makekeystore.cmd
@@ -2,5 +2,5 @@
@REM Set HOSTNAME to the server's hostname
@REM --------------------------------------------------------------------------
@SET HOSTNAME=localhost
-@del keystore
+@del serverKeyStore.jks
@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.MakeCertificate --hostname %HOSTNAME% --subject "CN=%HOSTNAME%, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US"
diff --git a/distrib/makekeystore_jdk.cmd b/distrib/makekeystore_jdk.cmd
index d3c9e949..121c6718 100644
--- a/distrib/makekeystore_jdk.cmd
+++ b/distrib/makekeystore_jdk.cmd
@@ -2,5 +2,5 @@
@REM Set HOSTNAME to the server's hostname
@REM --------------------------------------------------------------------------
@SET HOSTNAME=localhost
-@del keystore
-@keytool -keystore keystore -alias %HOSTNAME% -genkey -keyalg RSA -dname "CN=%HOSTNAME%, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US" \ No newline at end of file
+@del serverKeyStore.jks
+@keytool -keystore serverKeyStore.jks -alias %HOSTNAME% -genkey -keyalg RSA -dname "CN=%HOSTNAME%, OU=Gitblit, O=Gitblit, L=Some Town, ST=Some State, C=US" \ No newline at end of file