diff --git a/templates/compose/documenso.yaml b/templates/compose/documenso.yaml index 8536945ab..4fc5dd0a9 100644 --- a/templates/compose/documenso.yaml +++ b/templates/compose/documenso.yaml @@ -28,8 +28,9 @@ services: - NEXT_PRIVATE_SMTP_FROM_ADDRESS=${NEXT_PRIVATE_SMTP_FROM_ADDRESS} - NEXT_PRIVATE_DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@database/${POSTGRES_DB:-documenso-db}?schema=public - NEXT_PRIVATE_DIRECT_DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@database/${POSTGRES_DB:-documenso-db}?schema=public - - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/app/apps/remix/certs/certificate.p12 - - NEXT_PRIVATE_SIGNING_PASSPHRASE=${SERVICE_PASSWORD_DOCUMENSO} + - NEXT_PRIVATE_SIGNING_TRANSPORT=local-file + - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/app/certs/cert.p12 + - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PASSPHRASE=${SERVICE_PASSWORD_DOCUMENSO} - CERT_VALID_DAYS=${CERT_VALID_DAYS:-365} - CERT_INFO_COUNTRY_NAME=${CERT_INFO_COUNTRY_NAME:-DO} - CERT_INFO_STATE_OR_PROVIDENCE=${CERT_INFO_STATE_OR_PROVIDENCE:-Santiago} @@ -49,10 +50,14 @@ services: - /bin/sh - -c - | - echo "./certs" > /tmp/certs_dir_path - echo "./make-certs.sh" > /tmp/cert_script_path - echo "${SERVICE_PASSWORD_DOCUMENSO}" > /tmp/cert_pass - + CERT_DIR="/app/certs" + CERT_PASSPHRASE="${SERVICE_PASSWORD_DOCUMENSO}" + + # Save original working directory + ORIGINAL_DIR="$(pwd)" + + mkdir -p "$CERT_DIR" + touch /tmp/cert_info_path cat < /tmp/cert_info_path [ req ] @@ -68,11 +73,10 @@ services: emailAddress = ${CERT_INFO_EMAIL} EOF - cat < "$(cat /tmp/cert_script_path)" - mkdir -p "$(cat /tmp/certs_dir_path)" && cd "$(cat /tmp/certs_dir_path)" - + cd "$CERT_DIR" + openssl genrsa -out private.key 2048 - + openssl req \ -new \ -x509 \ @@ -80,19 +84,21 @@ services: -out certificate.crt \ -days ${CERT_VALID_DAYS} \ -config /tmp/cert_info_path - + openssl pkcs12 \ -export \ - -out certificate.p12 \ + -out cert.p12 \ -inkey private.key \ -in certificate.crt \ -legacy \ - -password file:/tmp/cert_pass - EOF - chmod +x "$(cat /tmp/cert_script_path)" - - sh "$(cat /tmp/cert_script_path)" - + -passout pass:"$CERT_PASSPHRASE" + + chown 1001:1001 cert.p12 private.key certificate.crt + chmod 400 cert.p12 private.key certificate.crt + + # Return to original directory before starting application + cd "$ORIGINAL_DIR" + ./start.sh database: