diff options
| author | Malfurious <m@lfurio.us> | 2023-09-15 10:59:09 -0400 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2023-09-15 10:59:09 -0400 |
| commit | a6f2c9e34b7a0bdaff2a44b54ca7999728f36773 (patch) | |
| tree | 73b2ff4824313805629ee98efd1844fd7b636da1 /gitolite/dotfiles | |
| parent | 5cd2822ed607d1f20d1d114aebe511a4fe5f1825 (diff) | |
| parent | c1db5d6e6557ac5f3b9d408eb2de888bf096a370 (diff) | |
| download | srcnode-a6f2c9e34b7a0bdaff2a44b54ca7999728f36773.tar.gz srcnode-a6f2c9e34b7a0bdaff2a44b54ca7999728f36773.zip | |
Merge branch 'gitolite-debian-refactor'
Refactor the gitolite docker image to build from Debian, but also clean
up a lot of the original build process.
The move off of archlinux is done since it is a sub-optimal pick for a
docker base. However, I'm specifically moving off it because archlinux
does not allow for the use of normalmode on i386 machines. Most offical
bases do, and debian seems to be a good fit for running gitolite.
Previously, this git repository was serving double duty as the code
repository for normalmode, as well as the site gitolite-admin
repository. This is no longer going to be the case - gitolite-admin is
now completely separate. Not only does this allow me to clean up the
folder structure, but going forward, the out-of-the-box experience of a
new install will be 'more correct' for what normalmode intends. IE: Our
config files will more often already be installed by default, instead of
requiring user-intervention on the gitolite-admin side of things.
The docker-compose.yml file is left behind. I'll update it after cgit
gets a similar treatment.
* gitolite-debian-refactor:
gitolite: Add admin initialization script
gitolite: Allow users to delete remote HEAD branches
gitolite: Remove hard-coded admin username
gitolite: Correct site-local code location
gitolite: Refactor Dockerfile for debian base
gitolite: Consolidate config files into a single directory
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 | ||||
| -rwxr-xr-x | gitolite/dotfiles/local/triggers/push (renamed from local/triggers/push) | 0 |
3 files changed, 4 insertions, 2 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/local/triggers/push b/gitolite/dotfiles/local/triggers/push index 7a3cb56..7a3cb56 100755 --- a/local/triggers/push +++ b/gitolite/dotfiles/local/triggers/push |