From a65690393cf5d72af938064d5979c466c791ed6c Mon Sep 17 00:00:00 2001 From: Herman Karlsson Date: Thu, 7 Sep 2023 23:04:54 +0200 Subject: [PATCH 1/3] add a more(?) sensible default --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index 4c25513..59f5ee5 100644 --- a/config.js +++ b/config.js @@ -8,7 +8,7 @@ module.exports = { port: process.env.PORT || 5000, // Hostname of the Taitan instance, and whether to communicate over HTTPS with it - taitanUrl: process.env.TAITAN_URL || "https://taitan.datasektionen.se", + taitanUrl: process.env.TAITAN_URL || "http://styrdokument-taitan.mjukglass.datasektionen.se", // The name of the template engine as it's called by consolidate.js, may differ from extension // Default template file to look for in subdirectories From f61da8aacd3405177c80c2a0aa1187652df0c5b9 Mon Sep 17 00:00:00 2001 From: Herman Karlsson Date: Thu, 7 Sep 2023 23:07:16 +0200 Subject: [PATCH 2/3] add autodeploy --- .github/workflows/deploy.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..e6eb4c4 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,28 @@ +name: Deploy + +on: + push: + branches: [ master ] + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Git checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + # See the following link for documentation: + # https://github.com/marketplace/actions/dokku + - name: Push to mjukglass + uses: dokku/github-action@v1.4.0 + with: + ssh_private_key: ${{ secrets.MJUKGLASS_GLOBAL_DEPLOY_KEY }} + git_remote_url: ssh://dokku@mjukglass.datasektionen.se/styrdokument + # force might feel risky, but there is no good reason why the server + # should ever not be a mirror of the deploy branch. And the errors we + # could get otherwise would probably be nasty to deal with + git_push_flags: --force \ No newline at end of file From aaa540b800c62d1c188afb7f1335c6556e2c5abb Mon Sep 17 00:00:00 2001 From: Mathias Magnusson Date: Sun, 17 Sep 2023 22:25:49 +0200 Subject: [PATCH 3/3] http -> https --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index 59f5ee5..dc3491e 100644 --- a/config.js +++ b/config.js @@ -8,7 +8,7 @@ module.exports = { port: process.env.PORT || 5000, // Hostname of the Taitan instance, and whether to communicate over HTTPS with it - taitanUrl: process.env.TAITAN_URL || "http://styrdokument-taitan.mjukglass.datasektionen.se", + taitanUrl: process.env.TAITAN_URL || "https://styrdokument-taitan.mjukglass.datasektionen.se", // The name of the template engine as it's called by consolidate.js, may differ from extension // Default template file to look for in subdirectories