Deploy newest lp and add psi config

* Deploy newest lp and add favicon.ico

* Remove newlines from block

* Remove ess google site verification

* Add google verify as a secret

Co-authored-by: Carlo Minotti <[email protected]>

.github/workflows/reusable.build-deploy.yml

@@ -86,7 +86,7 @@ jobs:
       run: |
         for f in ${{ inputs.docker_build_files }}; 
         do
-          cp -r ${f%%:*} ${f#*:};
+          cp ${f%%:*} ${f#*:};
         done
 
     - name: Log in to the Container registry

.github/workflows/scicat-landing-page-server.yml

@@ -44,7 +44,9 @@ jobs:
      - set_env
     uses: ./.github/workflows/reusable.build-deploy.yml
     with: 
-      docker_build_files: helm_configs/landing-page-server/${{ needs.set_env.outputs.environment }}/environment.ts:landing-page-server/src/environments/environment.essprod.ts
+      docker_build_files: >-
+        helm_configs/landing-page-server/${{ needs.set_env.outputs.environment }}/environment.ts:landing-page-server/src/environments/environment.essprod.ts 
+        helm_configs/landing-page-server/favicon.ico:landing-page-server/src/favicon.ico
       context: landing-page-server/.
       image_name: ${{ github.repository }}/landing-page-server
       release_name: landing-page-server
@@ -55,3 +57,4 @@ jobs:
       submodule: landing-page-server
     secrets:
       KUBECONFIG: ${{ secrets.KUBECONFIG }}
+      JSON_SECRETS: ${{ toJSON(secrets) }}

helm_configs/landing-page-server/production/environment.ts

@@ -0,0 +1,14 @@
+export const environment = {
+    accessDataHref:
+      "https://www.psi.ch/en/photon-science-data-services/slsswissfel-data-transfer",
+    accessInstructions:
+      "To access the data associated with this DOI click below and follow the instructions",
+    directMongoAccess: true,
+    doiBaseUrl: "https://doi.org/",
+    facility: "psi",
+    lbBaseURL: "https://dacat.psi.ch",
+    oaiProviderRoute: null,
+    production: true,
+    scicatBaseUrl: "https://discovery.psi.ch",
+    showLogoBanner: false
+  };

helm_configs/landing-page-server/production/values.yaml

@@ -0,0 +1,12 @@
+host: oaipmh-prod.qa.psi.ch
+
+secrets: 
+  "{{ .Release.Name }}-s":
+    type: Opaque
+    data: 
+      google-verification.html: '${{ secrets.LP_GOOGLE_VERIFY }}'
+
+volumeMounts: 
+  - name: secrets-volume
+    mountPath: '{{ b64dec "${{ secrets.LP_GOOGLE_VERIFY }}" | trimPrefix "google-site-verification: " }}'
+    subPath: google-verification.html

helm_configs/landing-page-server/values.yaml

@@ -25,3 +25,12 @@ ingress:
     - hosts:
       - "{{ .Values.host }}"
       secretName: "scicat-oaipmh-certificate"
+
+run:
+  command: 
+    - /bin/sh
+  args: 
+    - -c
+    - >
+      rm -f /usr/share/nginx/html/google43e14584df796f63.html;
+      nginx -g "daemon off;"