Skip to content

Commit 9985466

Browse files
committed
fix: 각 스크립트 경로 수정
1 parent b3f9964 commit 9985466

File tree

6 files changed

+28
-22
lines changed

6 files changed

+28
-22
lines changed

terraform/dev/locals.tf

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ locals {
4646
role = "dev"
4747
iam_instance_profile = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
4848
key_name = "eatda-ec2-dev-key"
49-
user_data = templatefile("${path.module}/scripts/user-data.sh", {
49+
user_data = templatefile("user-data.sh", {
5050
ecs_cluster_name = "dev-cluster"
5151
})
5252
}
@@ -65,13 +65,14 @@ locals {
6565
container_definitions_map = {
6666
for svc, def in local.task_definitions_with_roles : svc => [
6767
{
68-
name = svc
69-
image = svc == "api-dev" ? "${local.ecr_repo_urls["dev"]}:placeholder" : def.container_image
70-
cpu = def.cpu
71-
memory = def.memory
72-
essential = true
68+
name = svc
69+
image = svc == "api-dev" ? "${local.ecr_repo_urls["dev"]}:placeholder" : def.container_image
70+
cpu = def.cpu
71+
memory = def.memory
72+
essential = true
7373
stopTimeout = lookup(def, "stop_timeout", 30)
74-
command = svc == "api-dev" ? [
74+
working_directory = svc == "api-dev" ? "/app" : null,
75+
command = svc == "api-dev" ? [
7576
"java",
7677
"-javaagent:/app/dd-java-agent.jar",
7778
"-Ddd.service=eatda-api",

terraform/dev/s3/scripts/app-backup-dev-logs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
LOG_DIR="/home/ec2-user/logs/eatda"
4+
LOG_DIR="/home/ec2-user/logs"
55
S3_BUCKET="s3://eatda-storage-dev/backup/logs/"
66
TIMESTAMP=$(date +%Y-%m-%d-%H%M%S)
77
ARCHIVE_PATH="/tmp/eatda-logs-${TIMESTAMP}.tar.gz"

terraform/dev/s3/scripts/mysql-backup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
BACKUP_DIR="/home/ec2-user/eatda/mysql"
4+
BACKUP_DIR="/home/ec2-user/mysql"
55
S3_BUCKET="s3://eatda-storage-dev/backup/mysql/"
66
TIMESTAMP=$(date +%Y-%m-%d-%H%M%S)
77
ARCHIVE_PATH="${BACKUP_DIR}/mysql-backup-${TIMESTAMP}.sql"

terraform/dev/scripts/user-data.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ echo '/swapfile none swap sw 0 0' >> /etc/fstab
99

1010
mkdir -p /home/ec2-user/logs
1111
mkdir -p /home/ec2-user/mysql
12+
mkdir -p /home/ec2-user/scripts
1213

13-
aws s3 cp s3://eatda-storage-dev/scripts/app-backup-dev-logs.sh /home/ec2-user/logs/app-backup-dev-logs.sh
14-
chmod +x /home/ec2-user/logs/app-backup-dev-logs.sh
14+
aws s3 cp s3://eatda-storage-dev/scripts/app-backup-dev-logs.sh /home/ec2-user/scripts/app-backup-dev-logs.sh
15+
chmod +x /home/ec2-user/scripts/app-backup-dev-logs.sh
1516

16-
aws s3 cp s3://eatda-storage-dev/scripts/mysql-backup.sh /home/ec2-user/mysql/mysql-backup.sh
17-
chmod +x /home/ec2-user/mysql/mysql-backup.sh
17+
aws s3 cp s3://eatda-storage-dev/scripts/mysql-backup.sh /home/ec2-user/scripts/mysql-backup.sh
18+
chmod +x /home/ec2-user/scripts/mysql-backup.sh
1819

1920
yum install -y cronie
2021
systemctl enable crond
@@ -25,8 +26,8 @@ until systemctl is-active --quiet crond; do
2526
done
2627

2728
(
28-
crontab -l 2>/dev/null || true
29-
echo "0 0 * * 0 /home/ec2-user/logs/app-backup-dev-logs.sh >> /var/log/app-backup.log 2>&1"
30-
echo "30 0 * * 0 /home/ec2-user/mysql/mysql-backup.sh >> /var/log/mysql-backup.log 2>&1"
31-
) | crontab -
29+
sudo crontab -u ec2-user -l 2>/dev/null || true
30+
echo "0 0 * * 0 /home/ec2-user/scripts/app-backup-dev-logs.sh >> /var/log/app-backup.log 2>&1"
31+
echo "30 0 * * 0 /home/ec2-user/scripts/mysql-backup.sh >> /var/log/mysql-backup.log 2>&1"
32+
) | sudo crontab -u ec2-user -
3233

terraform/prod/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ locals {
5454
role = "prod"
5555
iam_instance_profile = "ec2-to-ecs"
5656
key_name = "eatda-ec2-prod-key"
57-
user_data = templatefile("${path.module}/scripts/user-data.sh", {
57+
user_data = templatefile("user-data.sh", {
5858
ecs_cluster_name = "prod-cluster"
5959
})
6060
}

terraform/prod/scripts/user-data.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ mkswap /swapfile
77
swapon /swapfile
88
echo '/swapfile none swap sw 0 0' >> /etc/fstab
99

10-
/bin/mkdir -p /home/ec2-user/logs/eatda
10+
mkdir -p /home/ec2-user/logs
11+
mkdir -p /home/ec2-user/scripts
1112

12-
aws s3 cp s3://eatda-storage-prod/scripts/app-backup-prod-logs.sh /home/ec2-user/logs/app-backup-prod-logs.sh
13-
chmod +x /home/ec2-user/logs/app-backup-prod-logs.sh
13+
aws s3 cp s3://eatda-storage-prod/scripts/app-backup-prod-logs.sh /home/ec2-user/scripts/app-backup-prod-logs.sh
14+
chmod +x /home/ec2-user/scripts/app-backup-prod-logs.sh
1415

1516
yum install -y cronie
1617
systemctl enable crond
@@ -20,4 +21,7 @@ until systemctl is-active --quiet crond; do
2021
sleep 1
2122
done
2223

23-
(crontab -l 2>/dev/null; echo "0 0 * * 0 /home/ec2-user/logs/app-backup-prod-logs.sh >> /var/log/app-backup.log 2>&1") | crontab -
24+
(
25+
sudo crontab -u ec2-user -l 2>/dev/null || true
26+
echo "0 0 * * 0 /home/ec2-user/scripts/app-backup-prod-logs.sh >> /home/ec2-user/logs/app-backup.log 2>&1"
27+
) | sudo crontab -u ec2-user -

0 commit comments

Comments
 (0)