From 3cb7eba42bd94a7f9443f01aa3b14e7ada7c4118 Mon Sep 17 00:00:00 2001 From: Mario Alegre Date: Thu, 16 Jul 2020 19:49:38 -0400 Subject: [PATCH] minor changes to Gitea --- src/gitea/Containerfile | 14 +++----------- src/gitea/assets/app.ini.esh | 4 ++-- src/gitea/bugfix/cronfix | 2 -- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 src/gitea/bugfix/cronfix diff --git a/src/gitea/Containerfile b/src/gitea/Containerfile index 40359ab..64e098e 100644 --- a/src/gitea/Containerfile +++ b/src/gitea/Containerfile @@ -8,15 +8,15 @@ FROM localhost/debian:latest LABEL deployopts="\ -p 9081:80 \ -p 9022:22 \ --v /tank/files/git:/vol/git \ --v /tank/files/db/gitea:/vol/db" +-v /srv/vol/gitea/git:/vol/git \ +-v /srv/vol/gitea/db:/vol/db" # make sure mount directories exist RUN mkdir -p /vol/git /vol/db # Build variables # version of Gitea # see the Gitea github page to determine the latest stable release -ARG giteav=1.11.5 +ARG giteav=1.12.1 # version of postgres ARG psqlv=11 # uid that the files owner user should have @@ -82,11 +82,3 @@ COPY assets/gitea.service /etc/systemd/system/ ### COPY assets/crontab /root/ RUN crontab -u gitea /root/crontab - -### -### Bugfix -### - -# execute command to workaround bug in cron -COPY bugfix/cronfix /root/ -RUN chmod +x /root/cronfix && /root/cronfix diff --git a/src/gitea/assets/app.ini.esh b/src/gitea/assets/app.ini.esh index 4ce564e..532f1e2 100644 --- a/src/gitea/assets/app.ini.esh +++ b/src/gitea/assets/app.ini.esh @@ -26,8 +26,8 @@ PATH = /var/lib/gitea/data/gitea.db ROOT = /vol/git/repos [server] -DOMAIN = medusa.alemor.org -ROOT_URL = http://medusa.alemor.org/git/ +DOMAIN = git.alemor.org +ROOT_URL = https://git.alemor.org/ HTTP_PORT = 80 START_SSH_SERVER = true SSH_PORT = 4323 diff --git a/src/gitea/bugfix/cronfix b/src/gitea/bugfix/cronfix deleted file mode 100644 index 483c9dc..0000000 --- a/src/gitea/bugfix/cronfix +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sed -i '/session required pam_loginuid.so/c\#session required pam_loginuid.so' /etc/pam.d/cron