From 33f21b44d26398e7ba6b99981ec238574ed9a697 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 18 May 2024 14:45:00 -0300
Subject: [PATCH] Further local dev tidying

Closes autonomic-cooperative/astro-payload-template#2
---
 .drone.yml                             | 2 +-
 .env => .env.sample                    | 5 ++---
 .gitignore                             | 3 ++-
 compose.yml => docker-compose.prod.yml | 0
 docker-compose.yml                     | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename .env => .env.sample (72%)
 rename compose.yml => docker-compose.prod.yml (100%)

diff --git a/.drone.yml b/.drone.yml
index de32549..d4f7e03 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,6 +31,7 @@ steps:
   - name: deploy stack
     image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
+      compose: docker-compose.prod.yml
       stack: paystro_swarm-demo_autonomic_zone
       host: swarm-demo.autonomic.zone
       deploy_key:
@@ -45,7 +46,6 @@ steps:
       REPOSITORY: "autonomic-cooperative/astro-payload-test"
       PAYLOAD_URL: "https://admin.paystro.swarm-demo.autonomic.zone"
     depends_on:
-      # - publish astro container
       - publish payload container
 trigger:
   branch:
diff --git a/.env b/.env.sample
similarity index 72%
rename from .env
rename to .env.sample
index 994507e..6a67efb 100644
--- a/.env
+++ b/.env.sample
@@ -1,8 +1,7 @@
-# This file is just for local dev; see <somewhere else> for live deployment
+# This file is just for local dev; see .drone.yml for live deployment
 NAME=astroad
 
-PAYLOAD_URL=http://localhost:3003
-PAYLOAD_PORT=3003
+PAYLOAD_PORT=3001
 
 ##############################################################################
 # Infinite nerd depth settings, you probably don't need to change these      #
diff --git a/.gitignore b/.gitignore
index a52ca30..472e5d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.env
 data
 yarn-debug.log*
-yarn-error.log*
\ No newline at end of file
+yarn-error.log*
diff --git a/compose.yml b/docker-compose.prod.yml
similarity index 100%
rename from compose.yml
rename to docker-compose.prod.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c6a4ad..c14a422 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,6 @@ services:
       MONGODB_HOST: mongo
       MONGODB_PASSWORD:
       MONGODB_PORT: 27017
-      TOKEN: ${TOKEN}
     volumes:
       - ./payload/src:/base/src
       - ./astro/src/types.ts:/types.ts