diff options
| -rw-r--r-- | cgit/Dockerfile | 6 | ||||
| -rw-r--r-- | cgit/cgitrc | 4 | ||||
| -rw-r--r-- | cgit/httpd.conf | 4 | ||||
| -rw-r--r-- | cgit/logo.png | bin | 5923 -> 1459 bytes | |||
| -rw-r--r-- | docker-compose.yml | 6 | ||||
| -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 |
9 files changed, 14 insertions, 14 deletions
diff --git a/cgit/Dockerfile b/cgit/Dockerfile index 28891c7..904712f 100644 --- a/cgit/Dockerfile +++ b/cgit/Dockerfile @@ -1,16 +1,16 @@ # https://git.zx2c4.com/cgit/ FROM alpine -ARG NORMALMODE_VERSION +ARG SRCNODE_VERSION RUN apk --no-cache upgrade RUN apk --no-cache add apache2 cgit COPY httpd.conf /etc/apache2/ COPY cgitrc /etc/ -COPY logo.png /usr/share/normalmode/ +COPY logo.png /usr/share/srcnode/ -RUN echo "<div class=\"footer\">$(apk version cgit | awk '/cgit/{print $1}') | $NORMALMODE_VERSION</div>" >/footer +RUN echo "<div class=\"footer\">$(apk version cgit | awk '/cgit/{print $1}') | $SRCNODE_VERSION</div>" >/footer EXPOSE 80 CMD ["/usr/sbin/httpd", "-DFOREGROUND"] diff --git a/cgit/cgitrc b/cgit/cgitrc index c5a09f3..f835eaa 100644 --- a/cgit/cgitrc +++ b/cgit/cgitrc @@ -6,8 +6,8 @@ logo=/logo.png logo-link=/ footer=/footer -root-title=NormalMode.org Repositories -root-desc=Public repositories hosted on normalmode.org +root-title=Srcnode +root-desc=Git repositories hosted on srcnode clone-url=https://$HTTP_HOST$SCRIPT_NAME/$CGIT_REPO_URL ssh://git@$HTTP_HOST/$CGIT_REPO_URL diff --git a/cgit/httpd.conf b/cgit/httpd.conf index 6ffe913..fb49add 100644 --- a/cgit/httpd.conf +++ b/cgit/httpd.conf @@ -22,7 +22,7 @@ LogLevel warn Require all denied </Directory> -<Directory "/usr/share/normalmode/"> +<Directory "/usr/share/srcnode/"> AllowOverride None Require all granted </Directory> @@ -33,7 +33,7 @@ LogLevel warn Require all granted </Directory> -Alias /logo.png "/usr/share/normalmode/logo.png" +Alias /logo.png "/usr/share/srcnode/logo.png" Alias /cgit.css "/usr/share/webapps/cgit/cgit.css" Alias /cgit.png "/usr/share/webapps/cgit/cgit.png" diff --git a/cgit/logo.png b/cgit/logo.png Binary files differindex 4746a72..2b28fed 100644 --- a/cgit/logo.png +++ b/cgit/logo.png diff --git a/docker-compose.yml b/docker-compose.yml index 4af4c38..68ca9a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,15 +14,15 @@ services: build: context: "cgit" args: - NORMALMODE_VERSION: "normalmode v0.3.0" + SRCNODE_VERSION: "srcnode v0.3.0" restart: "always" volumes: - "data:/repositories:ro" networks: - "nginx-proxy-network" environment: - VIRTUAL_HOST: "normalmode.org" - LETSENCRYPT_HOST: "normalmode.org" + VIRTUAL_HOST: "YOUR-DOMAIN.example" + LETSENCRYPT_HOST: "YOUR-DOMAIN.example" volumes: data: 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" |
