summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--gitolite/dotfiles/.gitconfig (renamed from conf/.gitconfig)2
-rw-r--r--gitolite/dotfiles/.gitolite.rc (renamed from conf/.gitolite.rc)4
-rw-r--r--gitolite/gitolite.conf (renamed from conf/gitolite.conf)2
3 files changed, 5 insertions, 3 deletions
diff --git a/conf/.gitconfig b/gitolite/dotfiles/.gitconfig
index a998fec..6e33a9e 100644
--- a/conf/.gitconfig
+++ b/gitolite/dotfiles/.gitconfig
@@ -4,3 +4,5 @@
useConfigOnly = true
name = gitolite
email = gitolite
+[receive]
+ denyDeleteCurrent = warn
diff --git a/conf/.gitolite.rc b/gitolite/dotfiles/.gitolite.rc
index 25a5231..eefc022 100644
--- a/conf/.gitolite.rc
+++ b/gitolite/dotfiles/.gitolite.rc
@@ -74,12 +74,12 @@
# suggested locations for site-local gitolite code (see cust.html)
# this one is managed directly on the server
- # LOCAL_CODE => "$ENV{HOME}/local",
+ LOCAL_CODE => "$ENV{HOME}/local",
# or you can use this, which lets you put everything in a subdirectory
# called "local" in your gitolite-admin repo. For a SECURITY WARNING
# on this, see http://gitolite.com/gitolite/non-core.html#pushcode
- LOCAL_CODE => "$rc{GL_ADMIN_BASE}/local",
+ # LOCAL_CODE => "$rc{GL_ADMIN_BASE}/local",
# ------------------------------------------------------------------
diff --git a/conf/gitolite.conf b/gitolite/gitolite.conf
index a1602d0..89eb558 100644
--- a/conf/gitolite.conf
+++ b/gitolite/gitolite.conf
@@ -1,4 +1,4 @@
-@administrators = admin
+@administrators = %ADMIN
repo gitolite-admin
RW+ = @administrators