update nacsos-data

.gitlab-ci.yml

@@ -51,14 +51,17 @@ deploy-to-production:
   tags:
     - bare-metal
   script:
-#    - echo "Run as nacsos user"
-#    - sudo -u nacsos bash ./deploy.sh $CI_JOB_TOKEN
     - echo "Current working directory and user"
     - pwd
     - whoami
     - groups
-#    - echo "Becoming 'nacsos' user"
-#    - sudo -u nacsos -s
+    - echo $HOME
+    - echo "Reset git config"
+    - rm /home/gitlab-runner/.gitconfig
+    - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.pik-potsdam.de/".insteadOf "ssh://git@gitlab.pik-potsdam.de/"
+    - git config --global user.name gitlab-runner
+    - git config --global user.email gitlab-runner@gitlab.pik-potsdam.de
+    - git config --global -l --show-origin
     - echo "Go to deployment location"
     - cd /home/nacsos/nacsos-core
     - ls -lisah
@@ -70,7 +73,6 @@ deploy-to-production:
     - echo "Dropping virtual environment"
     - rm -rf venv
     - echo "Fetching updated source"
-    - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.pik-potsdam.de/".insteadOf "ssh://git@gitlab.pik-potsdam.de/"
     - git stash  # "reset" softly by stashing (in case files changed)
     - git pull origin production  # pull from origin (production branch)
     - echo "Creating new virtual environment"
@@ -86,6 +88,11 @@ deploy-to-production:
     - sudo chgrp -R nacsos /home/nacsos/nacsos-core
     - echo "Starting NACSOS-core service"
     - sudo systemctl start nacsos-core.service
+# DEPRECATED
+#    - echo "Run as nacsos user"
+#    - sudo -u nacsos bash ./deploy.sh $CI_JOB_TOKEN
+#    - echo "Becoming 'nacsos' user"
+#    - sudo -u nacsos -s
   when: manual
   only:
     - production

requirements.txt

@@ -9,4 +9,4 @@ httpx[http2]==0.23.1
 pymitter==0.4.0
 uvicorn==0.20.0
 python-multipart==0.0.5
--e git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@9bc6466d8a73768801fbf1dd84d27e6a15f072ae#egg=nacsos_data
+-e git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@e9713a94c7a50484c9a204c5514cfdea7d962694#egg=nacsos_data