diff --git a/.envrc b/.envrc index 402262d..3560150 100644 --- a/.envrc +++ b/.envrc @@ -1,9 +1,9 @@ PATH_add bin -export TF_VAR_do_token=$(pass jdormit-infra-do-token) -export DIGITALOCEAN_API_TOKEN=$(pass jdormit-infra-do-token) -export TF_VAR_spaces_access_id=$(pass jdormit-infra-spaces-access-id) -export TF_VAR_spaces_secret_key=$(pass jdormit-infra-spaces-secret-key) +# export TF_VAR_do_token=$(pass jdormit-infra-do-token) +# export DIGITALOCEAN_API_TOKEN=$(pass jdormit-infra-do-token) +# export TF_VAR_spaces_access_id=$(pass jdormit-infra-spaces-access-id) +# export TF_VAR_spaces_secret_key=$(pass jdormit-infra-spaces-secret-key) if [ -f ".env.local" ]; then echo "sourcing .env.local" diff --git a/.gitignore b/.gitignore index d1d76e7..13728e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/.env.local +.env.local /backend-config.tf */**/.terraform *.tfstate* diff --git a/prod/git-jeremydormitzer-com/packer/.envrc b/prod/git-jeremydormitzer-com/packer/.envrc index 31ec5d9..021a79e 100644 --- a/prod/git-jeremydormitzer-com/packer/.envrc +++ b/prod/git-jeremydormitzer-com/packer/.envrc @@ -1,7 +1,14 @@ source_up -export GITEA_MAILGUN_PASSWORD=$(pass noreply@mg.git.jeremydormitzer.com) -export GITEA_LFS_JWT_SECRET=$(pass packer-gitea-lfs-jwt-secret) -export GITEA_SECRET_KEY=$(pass packer-gitea-secret-key) -export GITEA_INTERNAL_TOKEN=$(pass packer-gitea-internal-token) -export GITEA_JWT_SECRET=$(pass packer-gitea-jwt-secret) +# export GITEA_MAILGUN_PASSWORD=$(pass noreply@mg.git.jeremydormitzer.com) +# export GITEA_LFS_JWT_SECRET=$(pass packer-gitea-lfs-jwt-secret) +# export GITEA_SECRET_KEY=$(pass packer-gitea-secret-key) +# export GITEA_INTERNAL_TOKEN=$(pass packer-gitea-internal-token) +# export GITEA_JWT_SECRET=$(pass packer-gitea-jwt-secret) + +if [ -f ".env.local" ]; then + echo "sourcing .env.local" + set -a + source ".env.local" + set +a +fi diff --git a/prod/jdormit-website-netlify/terraform/.envrc b/prod/jdormit-website-netlify/terraform/.envrc index fdf9587..185907a 100644 --- a/prod/jdormit-website-netlify/terraform/.envrc +++ b/prod/jdormit-website-netlify/terraform/.envrc @@ -1,3 +1,10 @@ source_up -export TF_VAR_netlify_token=$(pass netlify-terraform-access-token) +# export TF_VAR_netlify_token=$(pass netlify-terraform-access-token) + +if [ -f ".env.local" ]; then + echo "sourcing .env.local" + set -a + source ".env.local" + set +a +fi diff --git a/prod/justin-ghost-site/ansible/.envrc b/prod/justin-ghost-site/ansible/.envrc deleted file mode 100644 index 0512d72..0000000 --- a/prod/justin-ghost-site/ansible/.envrc +++ /dev/null @@ -1 +0,0 @@ -export ANSIBLE_INVENTORY="$(expand_path hosts.ini)" diff --git a/prod/justin-ghost-site/ansible/hosts.ini b/prod/justin-ghost-site/ansible/hosts.ini deleted file mode 100644 index f563a28..0000000 --- a/prod/justin-ghost-site/ansible/hosts.ini +++ /dev/null @@ -1 +0,0 @@ -justindormitzer.com ansible_host=167.71.186.105 ansible_user=root \ No newline at end of file diff --git a/prod/syncthing/packer/.envrc b/prod/syncthing/packer/.envrc index c4eb045..6ab305a 100644 --- a/prod/syncthing/packer/.envrc +++ b/prod/syncthing/packer/.envrc @@ -1,8 +1,15 @@ source_up -export SYNCTHING_USER=$(pass packer-syncthing-user) -export SYNCTHING_PW=$(pass packer-syncthing-pw) -export SYNCTHING_API_KEY=$(pass packer-syncthing-api-key) -export SYNCTHING_CERT_PEM=$(pass packer-syncthing-cert.pem) -export SYNCTHING_KEY_PEM=$(pass packer-syncthing-key.pem) -export CERTBOT_EMAIL=$(pass certbot-email) +# export SYNCTHING_USER=$(pass packer-syncthing-user) +# export SYNCTHING_PW=$(pass packer-syncthing-pw) +# export SYNCTHING_API_KEY=$(pass packer-syncthing-api-key) +# export SYNCTHING_CERT_PEM=$(pass packer-syncthing-cert.pem) +# export SYNCTHING_KEY_PEM=$(pass packer-syncthing-key.pem) +# export CERTBOT_EMAIL=$(pass certbot-email) + +if [ -f ".env.local" ]; then + echo "sourcing .env.local" + set -a + source ".env.local" + set +a +fi diff --git a/prod/wallabag/packer/.envrc b/prod/wallabag/packer/.envrc index 9e78ee2..c2bdd0d 100644 --- a/prod/wallabag/packer/.envrc +++ b/prod/wallabag/packer/.envrc @@ -1,14 +1,21 @@ source_up -export WALLABAG_MAILGUN_PASSWORD=$(pass packer-wallabag-mailgun-password) -export WALLABAG_SECRET=$(pass packer-wallabag-secret) -export WALLABAG_PASSWORD=$(pass wallabag.jeremydormitzer.com) -export WALLABAG_WALLABAGER_ID=$(pass packer-wallabag-wallabager-id) -export WALLABAG_WALLABAGER_SECRET=$(pass packer-wallabag-wallabager-secret) -export WALLABAG_ANDROID_APP_ID=$(pass packer-wallabag-android-app-id) -export WALLABAG_ANDROID_APP_SECRET=$(pass packer-wallabag-android-app-secret) -export WALLABAG_IPAD_ID=$(pass packer-wallabag-ipad-id) -export WALLABAG_IPAD_SECRET=$(pass packer-wallabag-ipad-secret) -export WALLABAG_WALLABAG_EL_ID=$(pass packer-wallabag-wallabag.el-id) -export WALLABAG_WALLABAG_EL_SECRET=$(pass packer-wallabag-wallabag.el-secret) -export CERTBOT_EMAIL=$(pass certbot-email) +# export WALLABAG_MAILGUN_PASSWORD=$(pass packer-wallabag-mailgun-password) +# export WALLABAG_SECRET=$(pass packer-wallabag-secret) +# export WALLABAG_PASSWORD=$(pass wallabag.jeremydormitzer.com) +# export WALLABAG_WALLABAGER_ID=$(pass packer-wallabag-wallabager-id) +# export WALLABAG_WALLABAGER_SECRET=$(pass packer-wallabag-wallabager-secret) +# export WALLABAG_ANDROID_APP_ID=$(pass packer-wallabag-android-app-id) +# export WALLABAG_ANDROID_APP_SECRET=$(pass packer-wallabag-android-app-secret) +# export WALLABAG_IPAD_ID=$(pass packer-wallabag-ipad-id) +# export WALLABAG_IPAD_SECRET=$(pass packer-wallabag-ipad-secret) +# export WALLABAG_WALLABAG_EL_ID=$(pass packer-wallabag-wallabag.el-id) +# export WALLABAG_WALLABAG_EL_SECRET=$(pass packer-wallabag-wallabag.el-secret) +# export CERTBOT_EMAIL=$(pass certbot-email) + +if [ -f ".env.local" ]; then + echo "sourcing .env.local" + set -a + source ".env.local" + set +a +fi