Skip to content

Commit 5cec22b

Browse files
was able to run script end to end manually pasting -- then rebooted machine
1 parent ebf8a79 commit 5cec22b

5 files changed

Lines changed: 60 additions & 12 deletions

File tree

infra/defect-dojo/post-install/post-install.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export NEWHOSTNAME="$instanceName.devopsshield.com"
1414
export nginx_folder="$HOME/django-DefectDojo/nginx"
1515
export databaseName="defectdojo"
1616
export databasePort="5432"
17-
export doPauses="false" # set to "true" to pause after each step
17+
export doPauses="true" # set to "true" to pause after each step
1818
# wait time for the container to be up and migrations to be done
1919
export waitTime=300
2020

@@ -43,14 +43,14 @@ sudo apt-get upgrade -y
4343
sudo NEEDRESTART_MODE=a apt-get dist-upgrade --yes
4444

4545
# find and replace the variables in the files
46-
find $HOME/OSS_django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_USER__/$USERNAME/g" {} \;
47-
find $HOME/OSS_django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_PASSWORD__/$PASSWORD/g" {} \;
48-
find $HOME/OSS_django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_HOST__/$postgresHostname/g" {} \;
49-
find $HOME/OSS_django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_NAME__/$databaseName/g" {} \;
50-
find $HOME/OSS_django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_PORT__/$databasePort/g" {} \;
46+
find $HOME/django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_USER__/$USERNAME/g" {} \;
47+
find $HOME/django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_PASSWORD__/$PASSWORD/g" {} \;
48+
find $HOME/django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_HOST__/$postgresHostname/g" {} \;
49+
find $HOME/django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_NAME__/$databaseName/g" {} \;
50+
find $HOME/django-DefectDojo/docker/environments/postgres-redis.env -type f -exec sed -i "s/__DD_DATABASE_PORT__/$databasePort/g" {} \;
5151

5252
# show the files
53-
cat $HOME/OSS_django-DefectDojo/docker/environments/postgres-redis.env
53+
cat $HOME/django-DefectDojo/docker/environments/postgres-redis.env
5454

5555
# pause if needed
5656
if [ "$doPauses" = "true" ]; then
@@ -191,7 +191,7 @@ echo "=========================="
191191

192192
export COMMAND="export DJANGO_SUPERUSER_PASSWORD="$adminPassword"; export DJANGO_SUPERUSER_USERNAME="$adminUser"; export DJANGO_SUPERUSER_EMAIL="$EMAIL"; python manage.py createsuperuser --no-input"
193193
echo "COMMAND: $COMMAND"
194-
docker exec oss_django-defectdojo-uwsgi-1 /bin/bash -c "$COMMAND"
194+
docker exec django-defectdojo-uwsgi-1 /bin/bash -c "$COMMAND"
195195

196196
# test the application
197197
# open a browser and go to https://$NEWHOSTNAME:8443/dashboard
@@ -214,7 +214,7 @@ echo "current docker-compose.override.yml"
214214
cat docker-compose.override.yml
215215

216216
# docker-compose service
217-
sudo cp $HOME/OSS_django-DefectDojo/systemd/defectdojo-composer.service /etc/systemd/system/
217+
sudo cp $HOME/django-DefectDojo/systemd/defectdojo-composer.service /etc/systemd/system/
218218
sudo systemctl enable defectdojo-composer
219219

220220
echo ""

infra/defect-dojo/post-install/post-install.template.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ echo "=========================="
191191

192192
export COMMAND="export DJANGO_SUPERUSER_PASSWORD="$adminPassword"; export DJANGO_SUPERUSER_USERNAME="$adminUser"; export DJANGO_SUPERUSER_EMAIL="$EMAIL"; python manage.py createsuperuser --no-input"
193193
echo "COMMAND: $COMMAND"
194-
docker exec oss_django-defectdojo-uwsgi-1 /bin/bash -c "$COMMAND"
194+
docker exec django-defectdojo-uwsgi-1 /bin/bash -c "$COMMAND"
195195

196196
# test the application
197197
# open a browser and go to https://$NEWHOSTNAME:8443/dashboard

infra/defect-dojo/post-install/run-local.ps1

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,33 @@ Write-Output "Preparing post-install.sh script"
149149
Write-Output "Copying post-install.sh script to $fqdnDefectDojo"
150150
scp -i $sshKeyPath -o StrictHostKeyChecking=no $postInstallScriptPath ${sshUser}@${fqdnDefectDojo}:~/django-DefectDojo/post-install.sh
151151

152+
# copy defectdojo-composer.service to vm
153+
$defectDojoComposerServicePath = "systemd/defectdojo-composer.service"
154+
$defectDoJoComposerServiceTemplatePath = "systemd/defectdojo-composer.template.service"
155+
156+
# but first transform the file by replacing __INSTANCE_NAME__ with $instanceName
157+
(Get-Content $defectDoJoComposerServiceTemplatePath) `
158+
-replace "__REPO_NAME__", "django-DefectDojo" `
159+
-replace "__HOME_USER__", $sshUser
160+
| Set-Content $defectDoJoComposerServicePath
161+
162+
# but first ensure the directory exists on the vm
163+
ssh -i $sshKeyPath -o StrictHostKeyChecking=no ${sshUser}@${fqdnDefectDojo} "mkdir -p ~/django-DefectDojo/systemd"
164+
165+
Write-Output "Copying $defectDojoComposerServicePath to $fqdnDefectDojo"
166+
scp -i $sshKeyPath -o StrictHostKeyChecking=no $defectDoJoComposerServicePath ${sshUser}@${fqdnDefectDojo}:~/django-DefectDojo/systemd/defectdojo-composer.service
167+
152168
$dockerComposeOverrideInitializeFalsePath = "docker-compose.override.https.initializefalse.yml"
153169

154170
Write-Output "Copying $dockerComposeOverrideInitializeFalsePath to $fqdnDefectDojo"
155171
scp -i $sshKeyPath -o StrictHostKeyChecking=no $dockerComposeOverrideInitializeFalsePath ${sshUser}@${fqdnDefectDojo}:~/django-DefectDojo/docker-compose.override.https.initializefalse.yml
156172

157-
$dockerEnvironmentsPostgresqlRedisPath = "docker/environments/postgresql-redis.env"
173+
$dockerEnvironmentsPostgresqlRedisPath = "docker/environments/postgres-redis.env"
158174

159175
Write-Output "Copying $dockerEnvironmentsPostgresqlRedisPath to $fqdnDefectDojo"
160176
# but first ensure the directory exists on the vm
161177
ssh -i $sshKeyPath -o StrictHostKeyChecking=no ${sshUser}@${fqdnDefectDojo} "mkdir -p ~/django-DefectDojo/docker/environments"
162-
scp -i $sshKeyPath -o StrictHostKeyChecking=no $dockerEnvironmentsPostgresqlRedisPath ${sshUser}@${fqdnDefectDojo}:~/django-DefectDojo/docker/environments/postgresql-redis.env
178+
scp -i $sshKeyPath -o StrictHostKeyChecking=no $dockerEnvironmentsPostgresqlRedisPath ${sshUser}@${fqdnDefectDojo}:~/django-DefectDojo/docker/environments/postgres-redis.env
163179

164180
# # run the post-install.sh script
165181
# Write-Output "Running post-install.sh script on $fqdnDefectDojo"
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[Unit]
2+
Description=DefectDojo applicaton with docker compose
3+
Requires=docker.service
4+
After=docker.service
5+
6+
[Service]
7+
Type=oneshot
8+
RemainAfterExit=true
9+
WorkingDirectory=/home/azureuser/django-DefectDojo/
10+
#EnvironmentFile=/home/azureuser/django-DefectDojo/env.defectdojo
11+
#ExecStart=/home/azureuser/django-DefectDojo/setEnv.defectdojo
12+
ExecStart=/home/azureuser/django-DefectDojo/dc-up-d.sh
13+
ExecStop=/home/azureuser/django-DefectDojo/dc-stop.sh
14+
15+
[Install]
16+
WantedBy=multi-user.target
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[Unit]
2+
Description=DefectDojo applicaton with docker compose
3+
Requires=docker.service
4+
After=docker.service
5+
6+
[Service]
7+
Type=oneshot
8+
RemainAfterExit=true
9+
WorkingDirectory=/home/__HOME_USER__/__REPO_NAME__/
10+
#EnvironmentFile=/home/__HOME_USER__/__REPO_NAME__/env.defectdojo
11+
#ExecStart=/home/__HOME_USER__/__REPO_NAME__/setEnv.defectdojo
12+
ExecStart=/home/__HOME_USER__/__REPO_NAME__/dc-up-d.sh
13+
ExecStop=/home/__HOME_USER__/__REPO_NAME__/dc-stop.sh
14+
15+
[Install]
16+
WantedBy=multi-user.target

0 commit comments

Comments
 (0)