Be more standalone by default

geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml

@@ -4,13 +4,13 @@ name: Continuous integration
 on:
   push:
 
-env:
-  PROJECT: {{cookiecutter.package}}
-  HAS_SECRETS: ${{'{{'}} secrets.HAS_SECRETS }}
-  # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
-  # OPENSHIFT_PROJECT: gs-gmf-{{cookiecutter.package}}
-  # The release branches
-  HELM_RELEASE_NAMES: int-{{cookiecutter.geomapfish_main_version_dash}},prod-{{cookiecutter.geomapfish_main_version_dash}}
+# To publish the images to be used on Kubernetes
+#env:
+#  PROJECT: {{cookiecutter.package}}
+#  HAS_SECRETS: ${{'{{'}} secrets.HAS_SECRETS }}
+#  # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
+#  # The release branches
+#  HELM_RELEASE_NAMES: int-{{cookiecutter.geomapfish_main_version_dash}},prod-{{cookiecutter.geomapfish_main_version_dash}}
 
 jobs:
   main:
@@ -21,12 +21,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: camptocamp/initialise-gopass-summon-action@v2
-        with:
-          ci-gpg-private-key: ${{'{{'}} secrets.CI_GPG_PRIVATE_KEY }}
-          github-gopass-ci-token: ${{'{{'}} secrets.GOPASS_CI_GITHUB_TOKEN }}
-          patterns: docker
-        if: env.HAS_SECRETS == 'HAS_SECRETS'
+      # To publish the images to be used on Kubernetes
+      # - uses: camptocamp/initialise-gopass-summon-action@v2
+      #   with:
+      #     ci-gpg-private-key: ${{'{{'}} secrets.CI_GPG_PRIVATE_KEY }}
+      #     github-gopass-ci-token: ${{'{{'}} secrets.GOPASS_CI_GITHUB_TOKEN }}
+      #     patterns: docker
+      #   if: env.HAS_SECRETS == 'HAS_SECRETS'
 
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
@@ -37,5 +38,6 @@ jobs:
       - name: Build
         run: ./build
 
-      - name: Publish
-        run: c2cciutils-publish
+      # To publish the images to be used on Kubernetes
+      # - name: Publish
+      #   run: c2cciutils-publish

geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml

@@ -52,7 +52,7 @@ services:
       file: docker-compose-lib.yaml
       service: redis
 
-  # To test OpenShift version
+  # To test Kubernetes version
   # redis_master:
   #   extends:
   #     file: docker-compose-lib.yaml

geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml

@@ -280,7 +280,7 @@ vars:
         host: '{REDIS_HOST}'
         port: '{REDIS_PORT}'
         db: '{REDIS_DB}'
-      # Openshift version
+      # Kubernetes version
       # arguments:
       #   sentinels:
       #     - - '{REDIS_HOST}'
@@ -376,9 +376,9 @@ no_interpreted:
   - reset_password.email_body
   - shortener.email_body
   - welcome_email.email_body
-#
-# Standalone version
-# runtime_postprocess:
-#   - expression: "int({})"
-#     vars:
-#       - cache.std.arguments.port
+
+# Only for Standalone version (should be commented for Kubernetes version)
+runtime_postprocess:
+  - expression: int({})
+    vars:
+      - cache.std.arguments.port

geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl

@@ -113,7 +113,7 @@ ${DISABLE_LOCAL}redis:
 ${DISABLE_LOCAL}  socket_timeout: ${REDIS_TIMEOUT}
 ${DISABLE_LOCAL}  # For standalone version
 ${DISABLE_LOCAL}  url: 'redis://${REDIS_HOST}:${REDIS_PORT}/${REDIS_DB}'
-${DISABLE_LOCAL}  # For OpenShift version
+${DISABLE_LOCAL}  # For Kubernetes version
 ${DISABLE_LOCAL}  # sentinels:
 ${DISABLE_LOCAL}  #   - - ${REDIS_HOST}
 ${DISABLE_LOCAL}  #     - ${REDIS_PORT}