From d950b2b5adf1c354b7f5c71f075d91ffac4a440a Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 29 Jun 2022 13:13:34 -0700 Subject: [PATCH 1/3] use hippo-themes Signed-off-by: Matthew Fisher --- aws/terraform/scripts/user-data.sh | 12 +++++++----- local/job/hippo.nomad | 13 +++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/aws/terraform/scripts/user-data.sh b/aws/terraform/scripts/user-data.sh index 06c020a..33cce72 100644 --- a/aws/terraform/scripts/user-data.sh +++ b/aws/terraform/scripts/user-data.sh @@ -87,11 +87,13 @@ mkdir -p /home/ubuntu/hippo sudo tar zxvf hippo-server-linux-x64.tar.gz -C /home/ubuntu/hippo echo "Install Hippo Theme - Fermyon" -curl -sLO https://gist.githubusercontent.com/bacongobbler/48dc7b01aa99fa4b893eeb6b62f8cd27/raw/fb4dae8f42bc6aea22b2566084d01fa0de845e7c/styles.css -curl -sLO https://gist.githubusercontent.com/bacongobbler/48dc7b01aa99fa4b893eeb6b62f8cd27/raw/fb4dae8f42bc6aea22b2566084d01fa0de845e7c/logo.svg -curl -sLO https://gist.githubusercontent.com/bacongobbler/48dc7b01aa99fa4b893eeb6b62f8cd27/raw/fb4dae8f42bc6aea22b2566084d01fa0de845e7c/config.json -curl -sLO https://www.fermyon.com/favicon.ico -mv styles.css /home/ubuntu/hippo/linux-x64/wwwroot/ +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/styles.css +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/avatar.a979e1d6.png +curl -sLo logo.svg https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/src/images/fermyon.svg +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/src/images/icon/favicon.ico +echo '{"title":"Fermyon"}' > config.json + +mv styles.css avatar.a979e1d6.png /home/ubuntu/hippo/linux-x64/wwwroot/ mv config.json favicon.ico logo.svg /home/ubuntu/hippo/linux-x64/wwwroot/assets/ # ----------------------------------------------------------------------------- diff --git a/local/job/hippo.nomad b/local/job/hippo.nomad index 25ee84b..d674895 100644 --- a/local/job/hippo.nomad +++ b/local/job/hippo.nomad @@ -62,12 +62,17 @@ job "hippo" { } artifact { - source = "https://gist.githubusercontent.com/bacongobbler/48dc7b01aa99fa4b893eeb6b62f8cd27/raw/fb4dae8f42bc6aea22b2566084d01fa0de845e7c/styles.css" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/styles.css" } artifact { - source = "https://gist.githubusercontent.com/bacongobbler/48dc7b01aa99fa4b893eeb6b62f8cd27/raw/fb4dae8f42bc6aea22b2566084d01fa0de845e7c/logo.svg" - destination = "local/${var.os}-x64/wwwroot/assets/" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/avatar.a979e1d6.png" + } + + artifact { + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/main/src/images/fermyon.svg" + destination = "local/${var.os}-x64/wwwroot/assets/logo.svg" + mode = "file" } artifact { @@ -98,7 +103,7 @@ job "hippo" { config { command = "bash" - args = ["-c", "mv local/styles.css local/${var.os}-x64/wwwroot/ && mv local/config.json local/${var.os}-x64/wwwroot/assets/ && cd local/${var.os}-x64 && ./Hippo.Web"] + args = ["-c", "mv local/styles.css local/avatar.a979e1d6.png local/${var.os}-x64/wwwroot/ && mv local/config.json local/${var.os}-x64/wwwroot/assets/ && cd local/${var.os}-x64 && ./Hippo.Web"] } } } From 4b3d595df1fb525765de7dd6acf698ecc5ce66a3 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 29 Jun 2022 13:18:13 -0700 Subject: [PATCH 2/3] install js Signed-off-by: Matthew Fisher --- aws/terraform/scripts/user-data.sh | 11 ++++++----- local/job/hippo.nomad | 10 +++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/aws/terraform/scripts/user-data.sh b/aws/terraform/scripts/user-data.sh index 33cce72..88dfc9f 100644 --- a/aws/terraform/scripts/user-data.sh +++ b/aws/terraform/scripts/user-data.sh @@ -87,13 +87,14 @@ mkdir -p /home/ubuntu/hippo sudo tar zxvf hippo-server-linux-x64.tar.gz -C /home/ubuntu/hippo echo "Install Hippo Theme - Fermyon" -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/styles.css -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/avatar.a979e1d6.png -curl -sLo logo.svg https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/src/images/fermyon.svg -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/src/images/icon/favicon.ico +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/styles.css +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/avatar.a979e1d6.png +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/js/index.js +curl -sLo logo.svg https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/src/images/fermyon.svg +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/src/images/icon/favicon.ico echo '{"title":"Fermyon"}' > config.json -mv styles.css avatar.a979e1d6.png /home/ubuntu/hippo/linux-x64/wwwroot/ +mv styles.css avatar.a979e1d6.png index.js /home/ubuntu/hippo/linux-x64/wwwroot/ mv config.json favicon.ico logo.svg /home/ubuntu/hippo/linux-x64/wwwroot/assets/ # ----------------------------------------------------------------------------- diff --git a/local/job/hippo.nomad b/local/job/hippo.nomad index d674895..123302e 100644 --- a/local/job/hippo.nomad +++ b/local/job/hippo.nomad @@ -62,11 +62,15 @@ job "hippo" { } artifact { - source = "https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/styles.css" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/styles.css" } artifact { - source = "https://raw.githubusercontent.com/fermyon/hippo-themes/439601f899c989b04ecdb3c37e08053a3e713bdf/css/avatar.a979e1d6.png" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/avatar.a979e1d6.png" + } + + artifact { + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/js/index.js" } artifact { @@ -103,7 +107,7 @@ job "hippo" { config { command = "bash" - args = ["-c", "mv local/styles.css local/avatar.a979e1d6.png local/${var.os}-x64/wwwroot/ && mv local/config.json local/${var.os}-x64/wwwroot/assets/ && cd local/${var.os}-x64 && ./Hippo.Web"] + args = ["-c", "mv local/styles.css local/avatar.a979e1d6.png local/index.js local/${var.os}-x64/wwwroot/ && mv local/config.json local/${var.os}-x64/wwwroot/assets/ && cd local/${var.os}-x64 && ./Hippo.Web"] } } } From 6e1575f1c146db6990cbfa519fac39ff0a4f0214 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 29 Jun 2022 15:28:12 -0700 Subject: [PATCH 3/3] pull from main (for now) Signed-off-by: Matthew Fisher --- aws/terraform/scripts/user-data.sh | 10 +++++----- local/job/hippo.nomad | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aws/terraform/scripts/user-data.sh b/aws/terraform/scripts/user-data.sh index 88dfc9f..d80af51 100644 --- a/aws/terraform/scripts/user-data.sh +++ b/aws/terraform/scripts/user-data.sh @@ -87,11 +87,11 @@ mkdir -p /home/ubuntu/hippo sudo tar zxvf hippo-server-linux-x64.tar.gz -C /home/ubuntu/hippo echo "Install Hippo Theme - Fermyon" -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/styles.css -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/avatar.a979e1d6.png -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/js/index.js -curl -sLo logo.svg https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/src/images/fermyon.svg -curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/src/images/icon/favicon.ico +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/main/css/styles.css +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/main/css/avatar.a979e1d6.png +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/main/js/index.js +curl -sLo logo.svg https://raw.githubusercontent.com/fermyon/hippo-themes/main/src/images/fermyon.svg +curl -sLO https://raw.githubusercontent.com/fermyon/hippo-themes/main/src/images/icon/favicon.ico echo '{"title":"Fermyon"}' > config.json mv styles.css avatar.a979e1d6.png index.js /home/ubuntu/hippo/linux-x64/wwwroot/ diff --git a/local/job/hippo.nomad b/local/job/hippo.nomad index 123302e..7ac719b 100644 --- a/local/job/hippo.nomad +++ b/local/job/hippo.nomad @@ -62,15 +62,15 @@ job "hippo" { } artifact { - source = "https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/styles.css" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/main/css/styles.css" } artifact { - source = "https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/css/avatar.a979e1d6.png" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/main/css/avatar.a979e1d6.png" } artifact { - source = "https://raw.githubusercontent.com/fermyon/hippo-themes/d5cd3c53035baf6d8ccd4b75f143eff4c58d4c2f/js/index.js" + source = "https://raw.githubusercontent.com/fermyon/hippo-themes/main/js/index.js" } artifact {