diff options
Diffstat (limited to 'gitolite')
| -rw-r--r-- | gitolite/Dockerfile | 2 | ||||
| -rw-r--r-- | gitolite/dotfiles/.gitconfig | 4 | ||||
| -rw-r--r-- | gitolite/dotfiles/srcnode.conf (renamed from gitolite/dotfiles/gl_normalmode.conf) | 0 | ||||
| -rw-r--r-- | gitolite/gitolite.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gitolite/Dockerfile b/gitolite/Dockerfile index 5d34312..db6de03 100644 --- a/gitolite/Dockerfile +++ b/gitolite/Dockerfile @@ -38,7 +38,7 @@ RUN mkdir -p /hostkeys/etc/ssh /run/sshd \ # The acting gitolite.conf file is managed by the gitolite-admin repository. In # order to install our default version of the file, we need to patch its contents # into the Setup.pm file in the gitolite installation. This helps maintain -# separation of normalmode and gitolite-admin version control. +# separation of srcnode and gitolite-admin version control. RUN grep -B1000000 __DATA__ /usr/share/gitolite3/lib/Gitolite/Setup.pm >/app/Setup.pm \ && cat /app/gitolite.conf >>/app/Setup.pm \ && cp /app/Setup.pm /usr/share/gitolite3/lib/Gitolite/Setup.pm diff --git a/gitolite/dotfiles/.gitconfig b/gitolite/dotfiles/.gitconfig index 6e33a9e..bd3e331 100644 --- a/gitolite/dotfiles/.gitconfig +++ b/gitolite/dotfiles/.gitconfig @@ -2,7 +2,7 @@ defaultBranch = master [user] useConfigOnly = true - name = gitolite - email = gitolite + name = srcnode + email = srcnode [receive] denyDeleteCurrent = warn diff --git a/gitolite/dotfiles/gl_normalmode.conf b/gitolite/dotfiles/srcnode.conf index 2589d2a..2589d2a 100644 --- a/gitolite/dotfiles/gl_normalmode.conf +++ b/gitolite/dotfiles/srcnode.conf diff --git a/gitolite/gitolite.conf b/gitolite/gitolite.conf index 7e1e73b..4ef6fa7 100644 --- a/gitolite/gitolite.conf +++ b/gitolite/gitolite.conf @@ -1,4 +1,4 @@ @administrators = %ADMIN @creators = @administrators -include "/git/gl_normalmode.conf" +include "/git/srcnode.conf" |