Server version: 2022-09-30_10_21_17
+ + diff --git a/package.json b/app/package.json similarity index 100% rename from package.json rename to app/package.json diff --git a/docker/buildimage.cmd b/docker/buildimage.cmd new file mode 100644 index 0000000..ef0a9a2 --- /dev/null +++ b/docker/buildimage.cmd @@ -0,0 +1,2 @@ +docker build -t dumbserver ../app/ +docker image save -o dumbserver.image.tar dumbserver \ No newline at end of file diff --git a/dumbserver.image.tar b/dumbserver.image.tar deleted file mode 100644 index 3a178f3..0000000 Binary files a/dumbserver.image.tar and /dev/null differ diff --git a/index.html b/index.html deleted file mode 100644 index bb8070e..0000000 --- a/index.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -Hello World!
- - diff --git a/setupAppServer.sh b/setupAppServer.sh deleted file mode 100644 index aeeae41..0000000 --- a/setupAppServer.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -export DEBIAN_FRONTEND=noninteractive - -apt -y update -apt -y upgrade -apt -y update -apt -y install docker.io - -docker image load -i /tmp/dumbserver.image.tar - -docker run -d -p 1280:1280 dumbserver \ No newline at end of file diff --git a/.terraform.lock.hcl b/terraform/.terraform.lock.hcl similarity index 100% rename from .terraform.lock.hcl rename to terraform/.terraform.lock.hcl diff --git a/appServer.tf b/terraform/appServer.tf similarity index 82% rename from appServer.tf rename to terraform/appServer.tf index 59fc1ef..df781ec 100644 --- a/appServer.tf +++ b/terraform/appServer.tf @@ -44,16 +44,21 @@ resource "aws_instance" "app_server" { # Uplaod docker image provisioner "file" { - source = "dumbserver.image.tar" + source = "../docker/dumbserver.image.tar" destination = "/tmp/dumbserver.image.tar" } + # Upload example data file + provisioner "file" { + source = "../app/dataDir/data" + destination = "/tmp/data" + } + provisioner "remote-exec" { inline = [ "chmod +x /tmp/setupAppServer.sh", "sudo /tmp/setupAppServer.sh" ] - } } diff --git a/gateways.tf b/terraform/gateways.tf similarity index 100% rename from gateways.tf rename to terraform/gateways.tf diff --git a/network.tf b/terraform/network.tf similarity index 100% rename from network.tf rename to terraform/network.tf diff --git a/outputs.tf b/terraform/outputs.tf similarity index 100% rename from outputs.tf rename to terraform/outputs.tf diff --git a/security.tf b/terraform/security.tf similarity index 100% rename from security.tf rename to terraform/security.tf diff --git a/terraform/setupAppServer.sh b/terraform/setupAppServer.sh new file mode 100644 index 0000000..370cc4a --- /dev/null +++ b/terraform/setupAppServer.sh @@ -0,0 +1,25 @@ +#!/bin/bash +export DEBIAN_FRONTEND=noninteractive + +apt -y update +apt -y upgrade +apt -y update +apt -y install podman + +podman image load -i /tmp/dumbserver.image.tar + +# create the directory for the data file and, if not existing (which is the default) copy the example file +mkdir -p /var/local/dumbserver +if [ ! -f /var/local/dumbserver/data ]; then + cp /tmp/data /var/local/dumbserver/ +fi + +podman run --name dumbserver -d -p 1280:1280 -v /var/local/dumbserver:/nodejsapp/dataDir dumbserver + +# make sure it comes up after reboot... +podman generate systemd --new --name dumbserver > /etc/systemd/system/dumbserver-podman.service +systemctl daemon-reload +systemctl enable dumbserver-podman.service + +# finally, all is set up and after all the updates we want to reboot into the new kernel version +shutdown -r 1 \ No newline at end of file diff --git a/subnets.tf b/terraform/subnets.tf similarity index 100% rename from subnets.tf rename to terraform/subnets.tf diff --git a/variables.tf b/terraform/variables.tf similarity index 100% rename from variables.tf rename to terraform/variables.tf