diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 8b0422d..eb9adfc 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -25,13 +25,13 @@ platform: arch: amd64 steps: -- name: print env1 +- name: print env image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea settings: envs: - drone_tag - drone_commit - - dronsigyle_build_number + - drone_build_number - drone_repo_name - drone_repo_namespace - gitea_mailer_host @@ -55,9 +55,6 @@ steps: - "echo \"export GITEA_SECURITY_INTERNAL_TOKEN='$${GITEA_SECURITY_INTERNAL_TOKEN}'\" >> env-gitea # \"gitea-security-internal-token\"" - "echo \"export GITEA_OAUTH2_JWT_SECRET='$${GITEA_OAUTH2_JWT_SECRET}'\" >> env-gitea # \"gitea-oauth2-jwt-secret\"" - "echo \"export GITEA_MAILER_PASSWD='$${GITEA_MAILER_PASSWD}'\" >> env-gitea # \"gitea-mailer-passwd\"" - #username: giles - #port: 2022 - #host: git.target-domain environment: GITEA_APP_NAME: from_secret: gitea-app-name diff --git a/docker-compose.yml b/docker-compose.yml index 337a77e..9b823a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,6 @@ services: environment: - USER_UID=1000 - USER_GID=1000 - - ROOT_URL=https://${DOMAIN}/git - SSH_DOMAIN=${DOMAIN} - GITEA_APP_NAME=${GITEA_APP_NAME} - GITEA_DOMAIN=${DOMAIN} diff --git a/git-hooks/pre-commit.old b/git-hooks/pre-commit similarity index 100% rename from git-hooks/pre-commit.old rename to git-hooks/pre-commit diff --git a/gitea/app.ini b/gitea/app.ini index 78ec9f5..7cac1fe 100644 --- a/gitea/app.ini +++ b/gitea/app.ini @@ -17,13 +17,13 @@ TEMP_PATH = /data/gitea/uploads APP_DATA_PATH = /data/gitea SSH_DOMAIN = ${DOMAIN} HTTP_PORT = 3000 -ROOT_URL = https://${DOMAIN}/git/ +ROOT_URL = https://${GITEA_DOMAIN}/git/ DISABLE_SSH = false SSH_PORT = 22 SSH_LISTEN_PORT = 22 LFS_START_SERVER = true LFS_CONTENT_PATH = /data/git/lfs -DOMAIN = ${DOMAIN} +DOMAIN = ${GITEA_DOMAIN} LFS_JWT_SECRET = ${GITEA_SERVER_LFS_JWT_SECRET} OFFLINE_MODE = false @@ -74,7 +74,7 @@ ENABLE_CAPTCHA = false DEFAULT_KEEP_EMAIL_PRIVATE = false DEFAULT_ALLOW_CREATE_ORGANIZATION = true DEFAULT_ENABLE_TIMETRACKING = true -NO_REPLY_ADDRESS = noreply.${DOMAIN} +NO_REPLY_ADDRESS = noreply.${GITEA_DOMAIN} [oauth2] JWT_SECRET = ${GITEA_OAUTH2_JWT_SECRET}