Skip to content

Commit a39f82a

Browse files
RLIndiaRLIndia
committed
Further simplification of userdata initiated tasks
1 parent 260204b commit a39f82a

4 files changed

Lines changed: 46 additions & 52 deletions

File tree

‎docker-compose.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,27 @@
55
##
66
###########################################################################
77

8-
version: '3.1'
8+
version: "3.1"
99
services:
1010
web:
1111
image: nginx:latest
1212
ports:
13-
- '80:80'
13+
- "80:80"
1414
volumes:
1515
- ${PWD}/nginx.conf:/etc/nginx/conf.d/default.conf
1616
- ${PWD}/integrations:/etc/nginx/myfiles
1717
networks:
1818
- sp2net
19-
19+
2020
cc-3102:
2121
image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.9.2_b995
2222
secrets:
2323
- source: sp2prod-config.json
2424
target: /rlc/cc/server/app/config/config.json
2525
depends_on:
26-
- scheduler-3102
26+
- scheduler-3102
2727
environment:
2828
- DB_HOST=REPLACE_WITH_PRIVATE_IP_OF_HOST
29-
- REDIS_HOST=REPLACE_WITH_PRIVATE_IP_OF_HOST
3029
- SCHEDULER_HOST=scheduler-3102
3130
- APP_ENV=PROD
3231
- APM_ENABLE=false
@@ -40,7 +39,7 @@ services:
4039
- ${PWD}/catalog:/rlc/cc/tools/deploy/catalog
4140
networks:
4241
- sp2net
43-
command: /bin/bash start.sh
42+
command: /bin/bash start.sh
4443

4544
scheduler-3102:
4645
image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.9.2_b995
@@ -49,7 +48,6 @@ services:
4948
target: /rlc/cc/server/app/config/config.json
5049
environment:
5150
- DB_HOST=REPLACE_WITH_PRIVATE_IP_OF_HOST
52-
- REDIS_HOST=REPLACE_WITH_PRIVATE_IP_OF_HOST
5351
- APP_ENV=PROD
5452
- APM_ENABLE=false
5553
- APM_URL=APM_URL
@@ -61,8 +59,8 @@ services:
6159
networks:
6260
- sp2net
6361
command: node ./app/scheduler/app.js
64-
65-
notificationsink:
62+
63+
notificationsink:
6664
image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/notificationsink:1.9.0_b2
6765
secrets:
6866
- source: sp2prod-config.json
@@ -84,7 +82,6 @@ secrets:
8482
external: true
8583
sp2prod-alert-config.json:
8684
external: true
87-
8885

8986
networks:
9087
sp2net:

‎makeconfigs.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,15 @@ echo "Modifying trustPolicy.json"
125125
jq -r ".trustPolicy.Statement[0].Principal.AWS=\"arn:aws:iam::$ac_name:role/$role_name\"" "$mytemp/trustPolicy.json" |
126126
jq -r ".roleName=\"RG-Portal-ProjectRole-$RG_ENV-$myrunid\"" |
127127
jq -r ".policyName=\"RG-Portal-ProjectPolicy-$RG_ENV-$myrunid\"" >"${RG_HOME}/config/trustPolicy.json"
128-
128+
echo "Modifying mongo-config.json file"
129+
jq -r ".db_ssl_enable=true" "$mytemp/mongo-config.json" |
130+
jq -r ".db_auth_enable=true" |
131+
jq -r ".db_documentdb_enable=true" |
132+
jq -r '.db_ssl_config.CAFile="rds-combined-ca-bundle.pem"' |
133+
jq -r '.db_ssl_config.PEMFile="mongodb.pem"' |
134+
jq -r ".db_auth_config.username=\"$myappuser\"" |
135+
jq -r ".db_auth_config.password=\"$myapppwd\"" |
136+
jq -r '.db_auth_config.authenticateDb="admin"' >"${RG_HOME}/config/mongo-config.json"
129137
tar -C "$RG_HOME" -czf config.tar.gz "config"/*
130138
tar -tf config.tar.gz
131139
rm -rf "$RG_HOME"

‎scripts/fixconfigs.sh‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
version="0.1.10"
2+
version="0.1.11"
33
echo "Fixing configs...(fixconfig.sh v$version)"
44

55
[ -z "$RG_HOME" ] && RG_HOME='/opt/deploy/sp2'
@@ -11,8 +11,6 @@ echo "RG_ENV=$RG_ENV"
1111
[ -z "$S3_SOURCE" ] && S3_SOURCE=rg-deployment-docs
1212
echo "S3_SOURCE=$S3_SOURCE"
1313

14-
myip=$(wget -q -O - http://169.254.169.254/latest/meta-data/local-ipv4)
15-
echo "Local IP : $myip"
1614
role_name="$(wget -q -O - http://169.254.169.254/latest/meta-data/iam/security-credentials/)"
1715
echo "Role name : $role_name"
1816
ac_name=$(wget -q -O - http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .accountId)
@@ -52,14 +50,13 @@ jq -r ".trustPolicy.Statement[0].Principal.AWS=\"arn:aws:iam::$ac_name:role/$rol
5250
echo "Fetching latest docker-compose.yml"
5351
aws s3 cp s3://${S3_SOURCE}/docker-compose.yml $RG_SRC
5452

55-
# Fix the Redis host and APP_ENV in the docker compose file.
53+
# Fix the APP_ENV in the docker compose file.
5654
# DB_HOST will be set later in the fixmongo.sh or fixdocdb.sh scripts.
5755
echo "Copying docker-compose.yml from $RG_SRC to $RG_HOME"
5856
# trunk-ignore(shellcheck/SC2016)
5957
repcmd='s#\${PWD}#'$RG_HOME'#'
6058
echo "Modifying docker-compose.yml"
6159
sed -e "$repcmd" "$RG_SRC/docker-compose.yml" >"$RG_HOME/docker-compose.yml"
62-
sed -i -e "s/REDIS_HOST.*/REDIS_HOST=$myip/" -e "s/APP_ENV.*/APP_ENV=$RG_ENV/" "$RG_HOME/docker-compose.yml"
63-
echo "Modified docker-compose.yml with APP_ENV=$RG_ENV and REDIS_HOST=$myip"
60+
echo "Modified docker-compose.yml with APP_ENV=$RG_ENV"
6461

6562
echo 'Configuration changed successfully'

‎scripts/fixdocdb.sh‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
version="0.1.6"
2+
version="0.1.7"
33
echo "Fixing DocumentDB....(fixdocdb.sh v$version)"
44

55
if [ "$1" == "-h" ] || [ $# -lt 5 ]; then
@@ -60,17 +60,9 @@ else
6060
mv "$RG_SRC/dump.tar.gz" "$RG_SRC/dump.old.tar.gz"
6161
fi
6262
echo "Downloading new dump file..."
63-
# aws s3 cp s3://${S3_SOURCE}/dump.tar.gz "$RG_SRC"
64-
# tar -xvf "$RG_SRC/dump.tar.gz" -C "$RG_SRC"
65-
# if [ ! -d "$RG_SRC/dump/PROD-cc" ]; then
66-
# echo "Could not find PROD-cc in downloaded file. Reverting to AMI version of dump."
67-
# rm -rf "$RG_SRC/dump"
68-
# mv "$RG_SRC/dump.old.tar.gz" "$RG_SRC/dump.tar.gz"
69-
# tar -xvf "$RG_SRC/dump.tar.gz" -C "$RG_SRC"
70-
# fi
7163
aws s3 cp s3://${S3_SOURCE}/dump.zip "$RG_SRC"
7264
echo "Extracting seed data from dump file."
73-
unzip "$RG_SRC/dump.zip" -o -d "$RG_SRC"
65+
unzip -o "$RG_SRC/dump.zip" -d "$RG_SRC"
7466
if [ ! "$(ls -A $RG_SRC/dump)" ]; then
7567
echo "Error: No files found in dump folder. Your database cannot be seeded."
7668
else
@@ -103,32 +95,32 @@ db.configs.insert({"key":"snsUrl","value":"$baseurl"});
10395
EOF
10496
fi
10597

106-
rootca="${RG_HOME}/config/rootCA.key"
107-
rlca="${RG_HOME}/config/RL-CA.pem"
108-
mongodbkey="${RG_HOME}/config/mongodb.key"
109-
mongodbcsr="${RG_HOME}/config/mongodb.csr"
110-
mongodbcrt="${RG_HOME}/config/mongodb.crt"
111-
echo "Creating mongodb.pem file"
112-
host_name="$(wget -q -O - http://169.254.169.254/latest/meta-data/local-hostname | sed -e 's/\..*//')"
113-
openssl genrsa -out "$rootca" 2048
114-
openssl req -x509 -new -nodes -key "$rootca" -sha256 -days 1024 -out "$rlca" -subj "/CN=."
115-
openssl genrsa -out "$mongodbkey" 2048
116-
openssl req -new -key "$mongodbkey" -out "$mongodbcsr" -subj "/CN=$host_name"
117-
openssl x509 -req -in "$mongodbcsr" -CA "$rlca" -CAkey "$rootca" -CAcreateserial -out "$mongodbcrt" -days 500 -sha256
118-
cat "$mongodbkey" "$mongodbcrt" >"$RG_HOME/config/mongodb.pem"
98+
# rootca="${RG_HOME}/config/rootCA.key"
99+
# rlca="${RG_HOME}/config/RL-CA.pem"
100+
# mongodbkey="${RG_HOME}/config/mongodb.key"
101+
# mongodbcsr="${RG_HOME}/config/mongodb.csr"
102+
# mongodbcrt="${RG_HOME}/config/mongodb.crt"
103+
# echo "Creating mongodb.pem file"
104+
# host_name="$(wget -q -O - http://169.254.169.254/latest/meta-data/local-hostname | sed -e 's/\..*//')"
105+
# openssl genrsa -out "$rootca" 2048
106+
# openssl req -x509 -new -nodes -key "$rootca" -sha256 -days 1024 -out "$rlca" -subj "/CN=."
107+
# openssl genrsa -out "$mongodbkey" 2048
108+
# openssl req -new -key "$mongodbkey" -out "$mongodbcsr" -subj "/CN=$host_name"
109+
# openssl x509 -req -in "$mongodbcsr" -CA "$rlca" -CAkey "$rootca" -CAcreateserial -out "$mongodbcrt" -days 500 -sha256
110+
# cat "$mongodbkey" "$mongodbcrt" >"$RG_HOME/config/mongodb.pem"
119111

120-
echo "Modifying mongo-config.json file"
121-
mytemp=$(mktemp -d -p "${RG_HOME}/tmp" -t "config.old.XXX")
122-
echo "$mytemp"
123-
cp "${RG_HOME}/config/mongo-config.json" "$mytemp"
124-
jq -r ".db_ssl_enable=true" "$mytemp/mongo-config.json" |
125-
jq -r ".db_auth_enable=true" |
126-
jq -r ".db_documentdb_enable=true" |
127-
jq -r '.db_ssl_config.CAFile="rds-combined-ca-bundle.pem"' |
128-
jq -r '.db_ssl_config.PEMFile="mongodb.pem"' |
129-
jq -r ".db_auth_config.username=\"$mydbuser\"" |
130-
jq -r ".db_auth_config.password=\"$mydbuserpwd\"" |
131-
jq -r '.db_auth_config.authenticateDb="admin"' >"${RG_HOME}/config/mongo-config.json"
112+
# echo "Modifying mongo-config.json file"
113+
# mytemp=$(mktemp -d -p "${RG_HOME}/tmp" -t "config.old.XXX")
114+
# echo "$mytemp"
115+
# cp "${RG_HOME}/config/mongo-config.json" "$mytemp"
116+
# jq -r ".db_ssl_enable=true" "$mytemp/mongo-config.json" |
117+
# jq -r ".db_auth_enable=true" |
118+
# jq -r ".db_documentdb_enable=true" |
119+
# jq -r '.db_ssl_config.CAFile="rds-combined-ca-bundle.pem"' |
120+
# jq -r '.db_ssl_config.PEMFile="mongodb.pem"' |
121+
# jq -r ".db_auth_config.username=\"$mydbuser\"" |
122+
# jq -r ".db_auth_config.password=\"$mydbuserpwd\"" |
123+
# jq -r '.db_auth_config.authenticateDb="admin"' >"${RG_HOME}/config/mongo-config.json"
132124

133125
echo "Modifying docker-compose.yml file"
134126
if [ -f "${RG_HOME}/docker-compose.yml" ]; then

0 commit comments

Comments
 (0)