Merge pull request 'ok' (#57) from development into master

Reviewed-on: #57

.github/workflows/tf_update_dev.yml

@@ -0,0 +1,24 @@
+name: www2.ourworld.tf
+on:
+  push:
+    branches: [ development ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www2.ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: www2.ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www2/www_ourworld_tf/
+          git log -1
+          git fetch
+          git reset --hard origin/development
+          sed -i "s/https:\/\/www.ourworld.tf/https:\/\/www2.ourworld.tf/g" config.toml
+          ./build.sh

.github/workflows/tf_update_prod.yml

@@ -0,0 +1,24 @@
+name: ourworld.tf
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www_ourworld_tf/
+          git log -1
+          git fetch
+          git reset --hard origin/master
+          sed -i "s/https:\/\/www2.ourworld.tf/https:\/\/ourworld.tf/g" config.toml
+          ./build.sh

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://www2.ourworld.tf"
+base_url = "https://www.ourworld.tf"
 # Change this to your own URL! Please note this variable **must** be uncommented.
 
 title = "OURWORLD"