From 81a9aedb17fe2a589c82f59f49ecc2fa2ca66532 Mon Sep 17 00:00:00 2001 From: Giles Date: Thu, 13 Aug 2020 20:08:28 +0100 Subject: [PATCH] ci: jsonnet secrets --- .drone/drone-home.yml | 80 ++++++++++------------------- .drone/lib/public-secrets.libsonnet | 7 ++- .drone/lib/secret-secrets.libsonnet | 6 +-- 3 files changed, 32 insertions(+), 61 deletions(-) diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index acd868b..78656f9 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -19,10 +19,9 @@ steps: - drone_repo_namespace - git_domain - local_docker_registry - - gitea_mailer_host - - gitea_mailer_from - - gitea_mailer_user - - gitea_app_name + - ghost_mail_service + - ghost_mail_user + - commento_origin host: from_secret: ssh-host password: @@ -33,21 +32,18 @@ steps: - rm -f env-ghost - "echo \"export GIT_DOMAIN='$${GIT_DOMAIN}'\" >> env-ghost # \"git-domain\"" - "echo \"export LOCAL_DOCKER_REGISTRY='$${LOCAL_DOCKER_REGISTRY}'\" >> env-ghost # \"local-docker-registry\"" - - "echo \"export GITEA_MAILER_HOST='$${GITEA_MAILER_HOST}'\" >> env-ghost # \"gitea-mailer-host\"" - - "echo \"export GITEA_MAILER_FROM='$${GITEA_MAILER_FROM}'\" >> env-ghost # \"gitea-mailer-from\"" - - "echo \"export GITEA_MAILER_USER='$${GITEA_MAILER_USER}'\" >> env-ghost # \"gitea-mailer-user\"" - - "echo \"export GITEA_APP_NAME='$${GITEA_APP_NAME}'\" >> env-ghost # \"gitea-app-name\"" + - "echo \"export GHOST_MAIL_SERVICE='$${GHOST_MAIL_SERVICE}'\" >> env-ghost # \"ghost-mail-service\"" + - "echo \"export GHOST_MAIL_USER='$${GHOST_MAIL_USER}'\" >> env-ghost # \"ghost-mail-user\"" + - "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\"" username: from_secret: ssh-user environment: - GITEA_APP_NAME: - from_secret: gitea-app-name - GITEA_MAILER_FROM: - from_secret: gitea-mailer-from - GITEA_MAILER_HOST: - from_secret: gitea-mailer-host - GITEA_MAILER_USER: - from_secret: gitea-mailer-user + COMMENTO_ORIGIN: + from_secret: commento-origin + GHOST_MAIL_SERVICE: + from_secret: ghost-mail-service + GHOST_MAIL_USER: + from_secret: ghost-mail-user GIT_DOMAIN: from_secret: git-domain LOCAL_DOCKER_REGISTRY: @@ -102,15 +98,10 @@ steps: - drone_repo_namespace - git_domain - local_docker_registry - - gitea_mailer_host - - gitea_mailer_from - - gitea_mailer_user - - gitea_app_name - - gitea_server_lfs_jwt_secret - - gitea_security_secret_key - - gitea_security_internal_token - - gitea_oauth2_jwt_secret - - gitea_mailer_passwd + - ghost_mail_service + - ghost_mail_user + - commento_origin + - ghost_mysql_root_password - registry_password host: from_secret: ssh-host @@ -119,18 +110,13 @@ steps: port: from_secret: ssh-port script: - - export GITEA_SERVER_LFS_JWT_SECRET=$${GITEA_SERVER_LFS_JWT_SECRET} - - export GITEA_SECURITY_SECRET_KEY=$${GITEA_SECURITY_SECRET_KEY} - - export GITEA_SECURITY_INTERNAL_TOKEN=$${GITEA_SECURITY_INTERNAL_TOKEN} - - export GITEA_OAUTH2_JWT_SECRET=$${GITEA_OAUTH2_JWT_SECRET} - - export GITEA_MAILER_PASSWD=$${GITEA_MAILER_PASSWD} + - export GHOST_MYSQL_ROOT_PASSWORD=$${GHOST_MYSQL_ROOT_PASSWORD} - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} - export GIT_DOMAIN=$${GIT_DOMAIN} - export LOCAL_DOCKER_REGISTRY=$${LOCAL_DOCKER_REGISTRY} - - export GITEA_MAILER_HOST=$${GITEA_MAILER_HOST} - - export GITEA_MAILER_FROM=$${GITEA_MAILER_FROM} - - export GITEA_MAILER_USER=$${GITEA_MAILER_USER} - - export GITEA_APP_NAME=$${GITEA_APP_NAME} + - export GHOST_MAIL_SERVICE=$${GHOST_MAIL_SERVICE} + - export GHOST_MAIL_USER=$${GHOST_MAIL_USER} + - export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN} - set -e - cd /stack/ghost - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}" @@ -139,24 +125,14 @@ steps: username: from_secret: ssh-user environment: - GITEA_APP_NAME: - from_secret: gitea-app-name - GITEA_MAILER_FROM: - from_secret: gitea-mailer-from - GITEA_MAILER_HOST: - from_secret: gitea-mailer-host - GITEA_MAILER_PASSWD: - from_secret: gitea-mailer-passwd - GITEA_MAILER_USER: - from_secret: gitea-mailer-user - GITEA_OAUTH2_JWT_SECRET: - from_secret: gitea-oauth2-jwt-secret - GITEA_SECURITY_INTERNAL_TOKEN: - from_secret: gitea-security-internal-token - GITEA_SECURITY_SECRET_KEY: - from_secret: gitea-security-secret-key - GITEA_SERVER_LFS_JWT_SECRET: - from_secret: gitea-server-lfs-jwt-secret + COMMENTO_ORIGIN: + from_secret: commento-origin + GHOST_MAIL_SERVICE: + from_secret: ghost-mail-service + GHOST_MAIL_USER: + from_secret: ghost-mail-user + GHOST_MYSQL_ROOT_PASSWORD: + from_secret: ghost-mysql-root-password GIT_DOMAIN: from_secret: git-domain LOCAL_DOCKER_REGISTRY: diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet index 46c9f60..179aa4e 100644 --- a/.drone/lib/public-secrets.libsonnet +++ b/.drone/lib/public-secrets.libsonnet @@ -1,8 +1,7 @@ [ 'git-domain', 'local-docker-registry', - 'gitea-mailer-host', - 'gitea-mailer-from', - 'gitea-mailer-user', - 'gitea-app-name', + 'ghost-mail-service', + 'ghost-mail-user', + 'commento-origin', ] diff --git a/.drone/lib/secret-secrets.libsonnet b/.drone/lib/secret-secrets.libsonnet index 282e720..5ac6217 100644 --- a/.drone/lib/secret-secrets.libsonnet +++ b/.drone/lib/secret-secrets.libsonnet @@ -1,8 +1,4 @@ [ - 'gitea-server-lfs-jwt-secret', - 'gitea-security-secret-key', - 'gitea-security-internal-token', - 'gitea-oauth2-jwt-secret', - 'gitea-mailer-passwd', + 'ghost-mysql-root-password', 'registry-password', ]