From 8ac3ef78b0459d135d8155cbbb1211363258b4b6 Mon Sep 17 00:00:00 2001 From: Lukian LEIZOUR Date: Mon, 7 Oct 2024 19:37:25 +0100 Subject: [PATCH 1/4] commit --- docker-compose.yml | 20 ++++++++++++++++---- index.js | 16 ++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a205214..98993a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,19 @@ services: network: host restart: always image: joclud_api - ports: - - "3000:3000" - - "443:443" - container_name: joclud_api \ No newline at end of file + expose: + - 80 + networks: + - traefik + labels: + - "traefik.enable=true" + - "traefik.http.routers.joclud.rule=Host(`api.joclud.leizour.fr`)" + - "traefik.http.routers.joclud.entrypoints=websecure" + - "traefik.http.routers.joclud.tls=true" + - "traefik.http.routers.joclud.tls.certresolver=myresolver" + - "traefik.http.services.joclud.loadbalancer.server.port=80" + container_name: joclud_api + +networks: + traefik: + external: true \ No newline at end of file diff --git a/index.js b/index.js index 39bb8b3..03d140c 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,6 @@ const https = require("https"); require("dotenv").config(); const app = express(); -const port = config.port || 3000; app.use(express.json()); app.use(cookieParser()); @@ -34,17 +33,6 @@ function loadRoutes(folderName) { loadRoutes("api"); -app.listen(port, () => { - console.log(`Server listening on http://localhost:${port}/`); +app.listen(80, () => { + console.log(`Server listening on http://localhost:80/`); }); - -const privateKey = fs.readFileSync("./sslcert/privkey.pem", "utf8"); -const certificate = fs.readFileSync("./sslcert/fullchain.pem", "utf8"); - -const credentials = { key: privateKey, cert: certificate }; - -const httpsServer = https.createServer(credentials, app); - -httpsServer.listen(443, () => { - console.log("https server listening on port 443") -}) \ No newline at end of file From ce4b266042f8f65190932aba5463ddce74a4369f Mon Sep 17 00:00:00 2001 From: Lukian LEIZOUR Date: Wed, 25 Dec 2024 21:30:40 +0000 Subject: [PATCH 2/4] changed dockerfile name --- DOCKERFILE => Dockerfile | 0 sslcert/fullchain.pem | 47 ++++++++++++++++++++++++++++++++++++++++ sslcert/privkey.pem | 5 +++++ 3 files changed, 52 insertions(+) rename DOCKERFILE => Dockerfile (100%) create mode 100644 sslcert/fullchain.pem create mode 100644 sslcert/privkey.pem diff --git a/DOCKERFILE b/Dockerfile similarity index 100% rename from DOCKERFILE rename to Dockerfile diff --git a/sslcert/fullchain.pem b/sslcert/fullchain.pem new file mode 100644 index 0000000..3c223f8 --- /dev/null +++ b/sslcert/fullchain.pem @@ -0,0 +1,47 @@ +-----BEGIN CERTIFICATE----- +MIIDeDCCAv2gAwIBAgISA8F/kiHAA/K+lVOxTXvvRfxHMAoGCCqGSM49BAMDMDIx +CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF +NjAeFw0yNDA4MTIxMDUzMTFaFw0yNDExMTAxMDUzMTBaMBUxEzARBgNVBAMTCmxl +aXpvdXIuZnIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARk6uToCzQLKoY520Ey +oqYivRo1q0uXcRDIGVlhrQxLC9IJsM+jJXD/h5uxi7fUpOGr6zr6VDviDDnSqoM9 +oREoo4ICDjCCAgowDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB +BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRMdayx/ATVNWbijCYL +r+qrBI3axTAfBgNVHSMEGDAWgBSTJ0aYA6lRaI6Y1sRCSNsjv1iU0jBVBggrBgEF +BQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lNi5vLmxlbmNyLm9yZzAiBggr +BgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAVBgNVHREEDjAMggpsZWl6 +b3VyLmZyMBMGA1UdIAQMMAowCAYGZ4EMAQIBMIIBBgYKKwYBBAHWeQIEAgSB9wSB +9ADyAHcAPxdLT9ciR1iUHWUchL4NEu2QN38fhWrrwb8ohez4ZG4AAAGRRm4HeQAA +BAMASDBGAiEA3P3JWZxHpYHyVy56q48XwB6g1QXSHmou420ZVmYA5vwCIQCOmBae +ty5WxMaJrcoqJxYjhdxaGFbD4funWxnKnHtKAAB3AN/hVuuqBa+1nA+GcY2owDJO +rlbZbqf1pWoB0cE7vlJcAAABkUZuCEsAAAQDAEgwRgIhAPvW5R2VzidrR388WnCB +KxbAHqatyWwEdskZbxTvQAYdAiEA1GgguS81lTQIeqgDz6pT3WKRoB0WezlPPBs9 +HzjdTrUwCgYIKoZIzj0EAwMDaQAwZgIxAOXSTLtZ+Btg8PwWAAEVsA8mpiga2rhr +vlf4htZZnd0ND35jjk5luv1J4PaGIRSAHQIxAK3dn+WnTSsBOWrwXVzrISZlCIMf +Ba2JIN3D7q2HpJEku+FrtqpnqGF/g59ZY9TuWA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw +WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G +h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV +6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw +gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD +ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj +v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB +AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g +BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu +Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc +MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL +pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp +eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH +pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7 +s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu +h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv +YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8 +ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0 +LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+ +EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY +Ig46v9mFmBvyH04= +-----END CERTIFICATE----- diff --git a/sslcert/privkey.pem b/sslcert/privkey.pem new file mode 100644 index 0000000..0b03771 --- /dev/null +++ b/sslcert/privkey.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgXkaloprNQ8itLcFA +RMcIN/QXclkPiIgjC4RkvxFZBXOhRANCAARk6uToCzQLKoY520EyoqYivRo1q0uX +cRDIGVlhrQxLC9IJsM+jJXD/h5uxi7fUpOGr6zr6VDviDDnSqoM9oREo +-----END PRIVATE KEY----- From 6156e20eabde2d731b2351e9d342a12a64d24981 Mon Sep 17 00:00:00 2001 From: Lukian LEIZOUR Date: Wed, 25 Dec 2024 21:31:10 +0000 Subject: [PATCH 3/4] removed certs --- sslcert/fullchain.pem | 47 ------------------------------------------- sslcert/privkey.pem | 5 ----- 2 files changed, 52 deletions(-) delete mode 100644 sslcert/fullchain.pem delete mode 100644 sslcert/privkey.pem diff --git a/sslcert/fullchain.pem b/sslcert/fullchain.pem deleted file mode 100644 index 3c223f8..0000000 --- a/sslcert/fullchain.pem +++ /dev/null @@ -1,47 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDeDCCAv2gAwIBAgISA8F/kiHAA/K+lVOxTXvvRfxHMAoGCCqGSM49BAMDMDIx -CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF -NjAeFw0yNDA4MTIxMDUzMTFaFw0yNDExMTAxMDUzMTBaMBUxEzARBgNVBAMTCmxl -aXpvdXIuZnIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARk6uToCzQLKoY520Ey -oqYivRo1q0uXcRDIGVlhrQxLC9IJsM+jJXD/h5uxi7fUpOGr6zr6VDviDDnSqoM9 -oREoo4ICDjCCAgowDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB -BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRMdayx/ATVNWbijCYL -r+qrBI3axTAfBgNVHSMEGDAWgBSTJ0aYA6lRaI6Y1sRCSNsjv1iU0jBVBggrBgEF -BQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lNi5vLmxlbmNyLm9yZzAiBggr -BgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAVBgNVHREEDjAMggpsZWl6 -b3VyLmZyMBMGA1UdIAQMMAowCAYGZ4EMAQIBMIIBBgYKKwYBBAHWeQIEAgSB9wSB -9ADyAHcAPxdLT9ciR1iUHWUchL4NEu2QN38fhWrrwb8ohez4ZG4AAAGRRm4HeQAA -BAMASDBGAiEA3P3JWZxHpYHyVy56q48XwB6g1QXSHmou420ZVmYA5vwCIQCOmBae -ty5WxMaJrcoqJxYjhdxaGFbD4funWxnKnHtKAAB3AN/hVuuqBa+1nA+GcY2owDJO -rlbZbqf1pWoB0cE7vlJcAAABkUZuCEsAAAQDAEgwRgIhAPvW5R2VzidrR388WnCB -KxbAHqatyWwEdskZbxTvQAYdAiEA1GgguS81lTQIeqgDz6pT3WKRoB0WezlPPBs9 -HzjdTrUwCgYIKoZIzj0EAwMDaQAwZgIxAOXSTLtZ+Btg8PwWAAEVsA8mpiga2rhr -vlf4htZZnd0ND35jjk5luv1J4PaGIRSAHQIxAK3dn+WnTSsBOWrwXVzrISZlCIMf -Ba2JIN3D7q2HpJEku+FrtqpnqGF/g59ZY9TuWA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw -WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G -h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV -6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw -gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj -v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB -AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g -BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu -Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc -MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL -pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp -eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH -pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7 -s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu -h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv -YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8 -ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0 -LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+ -EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY -Ig46v9mFmBvyH04= ------END CERTIFICATE----- diff --git a/sslcert/privkey.pem b/sslcert/privkey.pem deleted file mode 100644 index 0b03771..0000000 --- a/sslcert/privkey.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgXkaloprNQ8itLcFA -RMcIN/QXclkPiIgjC4RkvxFZBXOhRANCAARk6uToCzQLKoY520EyoqYivRo1q0uX -cRDIGVlhrQxLC9IJsM+jJXD/h5uxi7fUpOGr6zr6VDviDDnSqoM9oREo ------END PRIVATE KEY----- From f72143aac77391ef006c87df3e4a2ba24be1528e Mon Sep 17 00:00:00 2001 From: Lukian LEIZOUR Date: Wed, 25 Dec 2024 21:37:01 +0000 Subject: [PATCH 4/4] commit --- docker-compose.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 98993a8..f39fcf4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,12 +2,9 @@ services: joclud_api: build: context: . - dockerfile: DOCKERFILE + dockerfile: Dockerfile network: host restart: always - image: joclud_api - expose: - - 80 networks: - traefik labels: @@ -21,4 +18,4 @@ services: networks: traefik: - external: true \ No newline at end of file + external: true