fix: CI: publishing branch

GDPR requires storing all data in EU or regions with similar privacy
laws. All data is stored in India at the moment, so we are not
compliant.

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: github pages
 on:
   push:
     branches:
-      - master # Set a branch to deploy
+      - mcaptcha.io # Set a branch to deploy
 
 jobs:
   build:
@@ -43,8 +43,9 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public
+          publish_branch: "mcaptcha-io-pages"
 
       - name: deploy
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' &&  github.repository == 'mCaptcha/website' }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/mcaptcha.io' &&  github.repository == 'mCaptcha/website' }}
         run: >-
-          curl --location --request POST "https://deploy.batsense.net/api/v1/update" --header 'Content-Type: application/json' --data-raw "{ \"secret\": \"${{ secrets.DEPLOY_TOKEN }}\", \"branch\": \"gh-pages\" }"
+          curl --location --request POST "https://deploy.batsense.net/api/v1/update" --header 'Content-Type: application/json' --data-raw "{ \"secret\": \"${{ secrets.DEPLOY_TOKEN_MCAPTCHA_IO }}\", \"branch\": \"mcaptcha-io-pages\" }"

.woodpecker.yml

@@ -3,11 +3,12 @@ pipeline:
     image: python
     when:
       event: [ push, pull_request, tag, deployment ]
-      branch: master
+      branch: mcaptcha.io
     commands:
     - curl -fsSL https://deb.nodesource.com/setup_16.x | bash - &&\
     - apt update && apt-get -y --no-install-recommends install nodejs tar gpg curl wget
     - make env
     - make
     - make ci-deploy
-    secrets: [ FORGEJO_WRITE_DEPLOY_KEY, LIBREPAGES_DEPLOY_SECRET ]
+    - echo 0
+    secrets: [ FORGEJO_WRITE_DEPLOY_KEY, LIBREPAGES_DEPLOY_SECRET_MCAPTCHA_IO ]

Makefile

@@ -8,10 +8,10 @@ ci-deploy: ## Deploy from CI/CD. Only call from within CI
 	fi
 	git config --global user.email "${CI_COMMIT_AUTHOR_EMAIL}"
 	git config --global user.name "${CI_COMMIT_AUTHOR}"
-	./scripts/hugo.sh deploy librepages public "${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>"
+	./scripts/hugo.sh deploy librepages-mcaptcha-io public "${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>"
 	./scripts/ci.sh --init "$$FORGEJO_WRITE_DEPLOY_KEY"
 	cat /tmp/ci-ssh-id
-	./scripts/ci.sh --deploy ${LIBREPAGES_DEPLOY_SECRET}  librepages
+	./scripts/ci.sh --deploy ${LIBREPAGES_DEPLOY_SECRET_MCAPTCHA_IO}  librepages-mcaptcha-io
 	./scripts/ci.sh --clean
 
 env: ## Download build dependencies and setup dev environment

config/_default/menus.toml

@@ -86,13 +86,23 @@
   url = "/security"
   identifier = "security"
   weight = 400
-
 [[footer]]
   name = "Status"
   url = "https://stats.uptimerobot.com/GK7VLFJnBl"
   weight = 500
 
+
+[[footer]]
+  name = "Support"
+  url = "/support/"
+  weight = 600
+
 [[footer]]
   name = "Thanks"
   url = "/thanks"
-  weight = 600
+  weight = 700
+
+[[footer]]
+  name = "ToS"
+  url = "/tos"
+  weight = 800

content/privacy-policy/index.md

@@ -35,6 +35,10 @@ The following information is collected:
 
 ## Contact us
 
-[Contact us]({{< ref "contact/index.md" >}}) if you have any questions.
+A user can request deletion or anonymisation of the data they are unable
+to delete themselves by sending a request to support@mcaptcha.io.
+
+A user can request an copy of the data held by mCaptcha that they are unable
+to download themselves by sending a request to support@mcaptcha.io.
 
 Effective Date: _20th May, 2021_

content/support/index.md

@@ -0,0 +1,22 @@
+---
+title: "Support"
+description: "mCaptcha commercial support information"
+date: 2022-10-31:16:18+02:00
+lastmod: 2022-10-31:16:18+02:00
+draft: false
+images: []
+---
+
+Commercial support is available from the lead developer, @realaravinth.
+To seek support, kindly contact:
+
+Aravinth Manivannan
+
+Email: support@mcaptcha.io
+
+Phone: +91 99438 15996
+
+8/1,
+Palaniappa Nagar, Coimbatore,
+Tamil Nadu,
+India - 641 041

content/tos/index.md

@@ -0,0 +1,34 @@
+---
+title: "Terms of Service"
+description: "mCaptcha commercial support information"
+date: 2022-10-31:16:18+02:00
+lastmod: 2022-10-31:16:18+02:00
+draft: false
+images: []
+---
+
+All applications and infrastructure software used in mCaptcha are
+published under a Free Software license.
+
+## Support
+
+Please see here for [support](/support) information.
+
+## Security
+
+Please see here for [security](/security) information.
+
+## No Questions Asked Cancellation and Refund Policy
+
+Full refund of purchases available for up to 15 days from the date of
+purchase. There is no capping on the refund amount. 100% of your
+purchase value would be refunded to you. The refund might take 2-5
+business days to process.
+
+Please contact support@mcaptcha.io to request a refund.
+
+## Human contact
+
+mCaptcha users are kindly invited to get in touch with
+realaravinth@batsense.net and organize a meeting in person to discuss
+the services provided.

scripts/ci.sh

@@ -76,7 +76,7 @@ deploy() {
 		help
 	else
 		git -c core.sshCommand="/usr/bin/ssh -oStrictHostKeyChecking=no -i $SSH_ID_FILE"\
-			push --force  $SSH_REMOTE_NAME $2
+			push -u --force  $SSH_REMOTE_NAME $2
 		curl -vv --location --request \
 			POST "https://deploy.batsense.net/api/v1/update"\
 			--header 'Content-Type: application/json' \