Skip to content

Commit 13855f1

Browse files
committed
Fix mongodb on
1 parent fcb6bf5 commit 13855f1

3 files changed

Lines changed: 41 additions & 14 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if [ -d ~/base ];
2222
then
2323
cd ~/base
24-
make stop
24+
make down
2525
fi
2626
2727
echo "Removing old version"
@@ -43,4 +43,4 @@ jobs:
4343
4444
echo "Starting new version"
4545
cd ~/base
46-
make run
46+
make up

Makefile

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,52 @@
11
include .env
22

3+
# ============================================================================
4+
# Deployment
5+
# ============================================================================
6+
7+
.PHONY: set
8+
set:
9+
sudo chmod 0755 ~
10+
sudo chmod -R a+w ~/data/
11+
sudo chmod 0700 ~/.ssh
12+
sudo chmod -R 0600 ~/.ssh/*
13+
export EXTERNAL_HOST=${EXTERNAL_HOST} DATA_PATH=${DATA_PATH} PROMETHEUS_PORT=${PROMETHEUS_PORT} GRAFANA_PORT=${GRAFANA_PORT}; \
14+
envsubst '$${EXTERNAL_HOST} $${DATA_PATH} $${PROMETHEUS_PORT} $${GRAFANA_PORT}' < infra/nginx/prod.conf > /etc/nginx/sites-enabled/base.conf
15+
sudo systemctl restart nginx
16+
sudo certbot --nginx
17+
18+
19+
.PHONY: certs
20+
certs:
21+
sudo systemctl restart nginx
22+
sudo certbot --nginx
23+
24+
# ============================================================================
25+
# Lifecycle
26+
# ============================================================================
27+
328
up:
429
docker compose -p base up --build -d
530

631
down:
732
docker compose -p base stop
833

34+
# ============================================================================
35+
# Status and monitoring
36+
# ============================================================================
37+
938
status:
1039
docker ps --format "table {{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Ports}}"
1140

12-
mongo:
13-
docker exec -it `docker ps -a | grep base-mongo | cut -d ' ' -f 1` mongosh -u ${MONGO_USER} -p ${MONGO_PASS}
41+
# ============================================================================
42+
# Logs
43+
# ============================================================================
1444

1545
# TODO: logs:
1646

17-
set:
18-
sudo chmod 0755 ~
19-
sudo chmod -R a+w ~/data/
20-
sudo chmod 0700 ~/.ssh
21-
sudo chmod -R 0600 ~/.ssh/*
22-
export EXTERNAL_HOST=${EXTERNAL_HOST} DATA_PATH=${DATA_PATH} PROMETHEUS_PORT=${PROMETHEUS_PORT} GRAFANA_PORT=${GRAFANA_PORT}; \
23-
envsubst '$${EXTERNAL_HOST} $${DATA_PATH} $${PROMETHEUS_PORT} $${GRAFANA_PORT}' < infra/nginx/prod.conf > /etc/nginx/sites-enabled/base.conf
24-
sudo systemctl restart nginx
25-
sudo certbot --nginx
47+
# ============================================================================
48+
# Development tools
49+
# ============================================================================
50+
51+
mongo:
52+
docker exec -it `docker ps -a | grep base-mongo | cut -d ' ' -f 1` mongosh -u ${MONGO_USER} -p ${MONGO_PASS}

infra/mongo/mongod.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ storage:
88
systemLog:
99
destination: file
1010
logAppend: true
11-
path: /data/logs/mongodb.log
11+
path: /proc/1/fd/1
1212

1313
# Network interfaces
1414
net:

0 commit comments

Comments
 (0)