merged hotfix changes back to staging

leibniz-psychology · Aug 15, 2024 · e1e8d19 · e1e8d19
2 parents b440ece + 4e9155d
commit e1e8d19
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile
@@ -10,22 +10,29 @@ RUN cd /home/opencpu && \
     apt-get update && \
     apt-get install -y openssl && \
     openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes \
-      -keyout ocpu_ssl.key -out ocpu_ssl.crt -subj "/CN=opencpu.zpid.de" \
-      -addext "subjectAltName=DNS:opencpu.zpid.de,DNS:www.opencpu.zpid.de,IP:127.0.0.1"
+      -keyout ocpu_ssl.key -out ocpu_ssl.crt -subj "/CN=opencpu.stg.zpid.org" \
+      -addext "subjectAltName=DNS:opencpu.stg.zpid.org,DNS:www.opencpu.stg.zpid.org,IP:127.0.0.1"
 
 RUN cd /home/opencpu && \
     mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \
     mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/
 
 #copy some config files
 COPY . /home/opencpu/psychOpenCama
+COPY .github/workflows/manifests/main/opencpu/index.html  /var/www/html/index.html
 
 RUN cd /home/opencpu && \
     R -e "install.packages('remotes')" && \
     R CMD build psychOpenCama && \
     mv psychOpenCama_*.tar.gz psychOpenCama_latest.tar.gz && \
 #    R -e "remotes::install_local('/home/opencpu/psychOpenCama_latest.tar.gz')"
-    R CMD INSTALL psychOpenCama_latest.tar.gz --library=/usr/local/lib/R/site-library
+    R CMD INSTALL psychOpenCama_latest.tar.gz --library=/usr/local/lib/R/site-library && \
+    chmod 755 /var/www/html/index.html
+#    touch /etc/ssl/certs/ocpu_ssl.crt && \
+#    touch /etc/ssl/private/ocpu_ssl.key && \
+#    chmod 644 /etc/ssl/certs/ocpu_ssl.crt && \
+#    chmod 400 /etc/ssl/private/ocpu_ssl.key
+
 
 # Set opencpu password
 RUN \

diff --git a/.github/workflows/manifests/main/opencpu/index.html b/.github/workflows/manifests/main/opencpu/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Health probe only</title>
+</head>
+<body>
+<p>Nothing to see here, as you can see. view: <a href="https://cama.psychopen.eu">PsychOpen CAMA</a></p>
+</body>
+</html>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,6 @@ Bugs:
 * included new dataset CAMA_Pharma
 * added metadata files for new dataset
 
-
 ## Release 1.0.9
 ### 03.2024
 Bugs:
@@ -17,6 +16,16 @@ Bugs:
 * added new datasets CAMA_TFP_Reduce, CAMA_TFP_Enhance
 * added metadata files for all datasets
 
+## Hotfix Release 1.0.7
+### 04.2023
+Sonstiges:
+* add index html to static folder
+*
+## Hotfix Release 1.0.6
+### 04.2023
+Bugs:
+* updated Dockerfile, removed static ssl files
+
 ## Hotfix Release 1.0.5
 ### 04.2023
 Bugs: