prueba

paulasuarezp · Jun 29, 2024 · d7764b4 · d7764b4
1 parent 0af55bf
commit d7764b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/TFG.yml b/.github/workflows/TFG.yml
@@ -70,8 +70,6 @@ jobs:
             PAYPAL_CLIENT_ID=${{ secrets.PAYPAL_CLIENT_ID }}
             PAYPAL_CLIENT_SECRET=${{ secrets.PAYPAL_CLIENT_SECRET }}
             PAYPAL_TOKEN=${{ secrets.PAYPAL_TOKEN }}
-            SSL_CERT=${{ secrets.SSL_CERT }}
-            SSL_PRIVKEY=${{ secrets.SSL_PRIVKEY }}
             NODE_ENV=production
   
   deploy:
@@ -100,13 +98,6 @@ jobs:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          export MONGO_URI=${{ secrets.MONGO_URI }}
-          export TOKEN_SECRET=${{ secrets.TOKEN_SECRET }}
-          export PAYPAL_CLIENT_ID=${{ secrets.PAYPAL_CLIENT_ID }}
-          export PAYPAL_CLIENT_SECRET=${{ secrets.PAYPAL_CLIENT_SECRET }}
-          export PAYPAL_TOKEN=${{ secrets.PAYPAL_TOKEN }}
-          export SSL_CERT=${{ secrets.SSL_CERT }}
-          export SSL_PRIVKEY=${{ secrets.SSL_PRIVKEY }}
           sudo docker-compose stop
           sudo docker-compose rm -f
           sudo docker-compose pull   

diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
@@ -12,8 +12,8 @@ services:
       - PAYPAL_CLIENT_ID=${PAYPAL_CLIENT_ID}
       - PAYPAL_CLIENT_SECRET=${PAYPAL_CLIENT_SECRET}
       - PAYPAL_TOKEN=${PAYPAL_TOKEN}
-      - SSL_CERT=/src/certs/fullchain.pem
-      - SSL_PRIVKEY=/src/certs/privkey.pem
+    volumes:
+      - ./certs:/src/certs
   webapp:
     image: ghcr.io/paulasuarezp/webapp:latest
     ports:

diff --git a/restapi/server.ts b/restapi/server.ts
@@ -1,4 +1,5 @@
 import * as dotenv from 'dotenv';
+import fs from 'fs';
 import http from 'http';
 import https from 'https';
 import mongoose from 'mongoose';
@@ -17,8 +18,8 @@ const mongoURI: string = process.env.NODE_ENV === 'test' ? process.env.TEST_MONG
 let httpsOptions = {};
 if (process.env.NODE_ENV === 'production') {
   httpsOptions = {
-    key: process.env.SSL_PRIVKEY,
-    cert: process.env.SSL_CERT
+    key: process.env.SSL_PRIVKEY ? fs.readFileSync('./certs/privkey.pem') : null,
+    cert: process.env.SSL_CERT ? fs.readFileSync('./certs/fullchain.pem') : null,
   };
 }