diff --git a/.env.infra-example b/.env.infra-example index 55c0279..d33c253 100644 --- a/.env.infra-example +++ b/.env.infra-example @@ -11,4 +11,4 @@ MYSQL_ROOT_PASSWORD="nhbnhb22" MYSQL_DATABASE="eatvio" MYSQL_USER="eatvio_user" MYSQL_PASSWORD="eatvio_pass_nhbnhb22" -MY_APP_GIT_URL="ssh://git@10.55.5.123:222/eatvio/eatvio.git" +MY_APP_GIT_URL="ssh://git@10.55.5.123:222/alex_chevski/eatvio.git" diff --git a/docker-compose.yml b/docker-compose.yml index 7c4ce54..f43dfdb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,7 @@ services: - "${SOKETI_PORT:-6001}:6001" - "${SOKETI_METRICS_SERVER_PORT:-9601}:9601" networks: - ns-eatvio: - ipv4_address: 172.118.0.5 + - ns-eatvio labels: - "traefik.enable=false" restart: always @@ -25,8 +24,7 @@ services: image: "mysql:8.0" working_dir: /application networks: - ns-eatvio: - ipv4_address: 172.118.0.3 + - ns-eatvio volumes: - ".:/application" - "./mysql_data:/var/lib/mysql" @@ -49,8 +47,7 @@ services: depends_on: - mysql networks: - ns-eatvio: - ipv4_address: 172.118.0.2 + - ns-eatvio volumes: - "./app:/application" - "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini" @@ -104,32 +101,34 @@ services: volumes: - "./app:/application" - "./phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf" + - "./phpdocker/nginx/alex.eatvio.local+4.pem:/etc/nginx/alex.eatvio.local+4.pem" + - "./phpdocker/nginx/alex.eatvio.local+4-key.pem:/etc/nginx/alex.eatvio.local+4-key.pem" + - "./phpdocker/nginx/socket.alex.eatvio.local+4.pem:/etc/nginx/socket.alex.eatvio.local+4.pem" + - "./phpdocker/nginx/socket.alex.eatvio.local+4-key.pem:/etc/nginx/socket.alex.eatvio.local+4-key.pem" ports: - "1092:80" + - "10443:5000" networks: - web - ns-eatvio - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "traefik.frontend.rule=Host:dev2.eatvio.com,socket.eatvio.com" - - "traefik.port=80" - - "traefik.protocol=http" mailhog: image: "mailhog/mailhog" ports: - "8082:8025" networks: - ns-eatvio: - ipv4_address: 172.118.0.4 + - ns-eatvio typesense: image: typesense/typesense:26.0 restart: on-failure + expose: + - 8108 + ports: + - 8108:8108 networks: - ns-eatvio: - ipv4_address: 172.118.0.6 + - ns-eatvio + - web volumes: - ./typesense-data:/data command: "--data-dir /data --api-key=typesense --enable-cors" diff --git a/phpdocker/nginx/alex.eatvio.local+4-key.pem b/phpdocker/nginx/alex.eatvio.local+4-key.pem new file mode 100644 index 0000000..403d482 --- /dev/null +++ b/phpdocker/nginx/alex.eatvio.local+4-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDidLGXEA9IJ8gC +/GdlWLDhw4q84zNE2sv1tZ2WvwP8swZfWeoQeRDDRXNdWKaV2wJW2aYKeoD8Rw1S +FmfqO9lhhfT80OiYIiG8THbMvyfi0nzivG9Vo1J2GY8bBI4Mtws6LFmVJs0Lg3ce +HIgUd3O14VNrQrlowY1nzImBBO6UBW/Pce/R6PW2rEK64DqzY/jy+qKp14N0zOVv +4X7FLwE9Bf3XBxJ946VFf9t8ec+1pM7U42vCZNnrigikiYDLs8giBkDwOecf+jvf +2Sn6n0UKEakjI0gd/Kt+uBbGRtJQUka4XnFquLnQd4Q2m3TZ36r74I/GFtskASa7 +5DvJpXWbAgMBAAECggEAdH3VEUGYquST9j1DLxZFv41opCw4JnZrL1Wi4HYYpfiu +EYTebGTq45ipdN5yq2oDNQw3ZvKHwb8HMjAGeq8Y7xsK4LbSv9fnBMdM4Zx/9yWS +SszmdOZUOB6DyEE6lX3fz6ga2SghmIejUiEZO3YLVwe3ctjbKfFPPZMxNOaFmCyP +3LpVXvG0Nh5G1DRZXtJDCVv7O99cA8q+5EyUJ20XFjkY36MAzFN/SjN7teGW0RSq +ASFubAEODPryCfwnCWZTCE3KzLJuwId4Yzfyqfd1q55glOmdTKdGsmPxJgxYv7WZ +2JTlNsZIWuv/753XzSiJrMrAsgByIyB7tsehUSegaQKBgQDm2zplHGdUWRPoQsLj +uCtLCF+WhWfQ+Jz6mt5CuT7Glp1mfAwgtjXg9EmHztNaFENswUuk1y69wlV+vBKk +XGhb3gjZQsZHjFYinN8BLK3pjBte+IMnKkoyhLV9EMUKvXvCxdxZJ1cnWJR1FeKp +/xCM37cNZkXekAAltKw3U2IxXQKBgQD7HsT+NEWYSP1/1U0B6PJVi8kNUBY/G7DP +3A5Le/S8WjbBGVPkOw1lFOvlXVi6Hmdlgqb5nBk7QZCzc+Mk9Mc3dJ66c1/uEjU7 +67e1oHL7OoA/QJ9WXsi4CR+9f07taV/uUsnLVAmbodK94VNHeMgn16Z24Su0irCH +ehVOh9t7VwKBgQDDzNL1aSbWqoqw5tbnT5AgnqR8RP/thL+X6fxzOSzeQGaVwsaC +hCikeG1ZK3mlICSjvDpNQFkbhxT+XcOt9dZpfKOiqfkEPCneR5D5LQ0AVd3tKfgL +Ito1iMtpnOySlG3AoBKo5y4LaBzaRcquhnBiG2jli4XdI+OMF3YtoqJY3QKBgQDk +GGbGn6Q3VtUrsAtqmLTFj1rnhL8wQ26u3yr81XLPQwJJE0BoJltcXUyH4eod5E/2 +nF4ei/M/J6bP2YuQneX2MS+cHAAettszuj/78el+2Px0d7ZDNYUL5P23mlOOwhAo +4Xn5/jNb8fkCEBEc8lCcH/1MLesM6oy+Ad4onq51sQKBgQCEjjSZ/J6QdlECjcRa +EfmZI4gDdgcavbKPbyUM54OXsVH4JOO31Vr+GA0bdXIy+kfQ69P1mxAO6ZaS5iuz +iW63LsDGCDtNybVcPap0BS0pfG7uVkw6Fn3rL5vxF8buKGfcJb6NRZh5VDQTUqyh ++L9/5TWkjFcG9t+Aaj7/Pe3hBA== +-----END PRIVATE KEY----- diff --git a/phpdocker/nginx/alex.eatvio.local+4.pem b/phpdocker/nginx/alex.eatvio.local+4.pem new file mode 100644 index 0000000..2d48a52 --- /dev/null +++ b/phpdocker/nginx/alex.eatvio.local+4.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENDCCApygAwIBAgIRAO6EUiZfVufPFe8Xmg2neeMwDQYJKoZIhvcNAQELBQAw +TzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRIwEAYDVQQLDAlhbGV4 +QGFsZXgxGTAXBgNVBAMMEG1rY2VydCBhbGV4QGFsZXgwHhcNMjQwOTAyMDc0MzI0 +WhcNMjYxMjAyMDc0MzI0WjA9MScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQg +Y2VydGlmaWNhdGUxEjAQBgNVBAsMCWFsZXhAYWxleDCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAOJ0sZcQD0gnyAL8Z2VYsOHDirzjM0Tay/W1nZa/A/yz +Bl9Z6hB5EMNFc11YppXbAlbZpgp6gPxHDVIWZ+o72WGF9PzQ6JgiIbxMdsy/J+LS +fOK8b1WjUnYZjxsEjgy3CzosWZUmzQuDdx4ciBR3c7XhU2tCuWjBjWfMiYEE7pQF +b89x79Ho9basQrrgOrNj+PL6oqnXg3TM5W/hfsUvAT0F/dcHEn3jpUV/23x5z7Wk +ztTja8Jk2euKCKSJgMuzyCIGQPA55x/6O9/ZKfqfRQoRqSMjSB38q364FsZG0lBS +RrhecWq4udB3hDabdNnfqvvgj8YW2yQBJrvkO8mldZsCAwEAAaOBnDCBmTAOBgNV +HQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAUwcxZ +u77uAlfsP52FQ+10ocE8KqgwUQYDVR0RBEowSIIRYWxleC5lYXR2aW8ubG9jYWyC +EGFsZXguZWF0dmlvLnRlc3SCCWxvY2FsaG9zdIcECjcFeYcQAAAAAAAAAAAAAAAA +AAAAATANBgkqhkiG9w0BAQsFAAOCAYEArx+/xKh7gO2rbB6bisYr5oLm6FLsbBZG +JWU7npue0LEiGvxy9jXwfF2subvX22wblHbuxUtKbWPMdAcMqcuQsFq8KeIcTZ9Z +NJ27cqLFbjzXFJIR+jnsrBNyUKvGnJKjXBS2rN/D51bLfNf/lkYoyzBtKf9VUPjs +mH94aByu3T8GoGDgOtBH7zc5GGzzAQ9i2Jgfpo//sxpiVPae5KX3r7cAdX50S/kN +WId2TxejtgnZsmuFuWha3qWIT0Bc69osJUrLQRoEO1vVGQpVL3qSdBsloFQZtCBY +hE3ZR/CnJqzm/iVR9x9OqAUdeKAA2EbAaBWOuJsyOQsWoJj4K4aFeFGoZ7OFU51f +9zS02vytWrhqSLItHTFPoOI8aw8CuY7cr4mWPyCTwjpEcpfP1upDsFqPP7aCjQDP +7HHsuiLaP1Wgr5LsO4WhDWjYzTvJnKbQWRX8AXeV2UUWJ3fMHDX3Sw0Jm0JoiNUO +muKBI6FMLIbqVEs/cOQaIXka4KSx4oA1 +-----END CERTIFICATE----- diff --git a/phpdocker/nginx/nginx.conf b/phpdocker/nginx/nginx.conf index 24046bb..b0f771e 100644 --- a/phpdocker/nginx/nginx.conf +++ b/phpdocker/nginx/nginx.conf @@ -39,6 +39,7 @@ server { include fastcgi_params; } } + server { listen 80; server_name socket.eatvio.com; @@ -60,3 +61,73 @@ server { error_log /dev/stdout info; access_log /dev/stdout; } + +server { + listen 5000 ssl; + server_name alex.eatvio.local; + + ssl_certificate /etc/nginx/alex.eatvio.local+4.pem; + ssl_certificate_key /etc/nginx/alex.eatvio.local+4-key.pem; + ssl_protocols TLSv1.2; + + charset UTF-8; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "strict-origin-when-cross-origin" always; + + server_tokens off; + client_max_body_size 100M; + root /application/public; + index index.php; + + # try to serve file directly, fallback to index.php + location / { + try_files $uri /index.php$is_args$args; + } + + if (!-e $request_filename) { + rewrite ^.*$ /index.php last; + } + + location ~ \.php$ { + fastcgi_pass phpupstream; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PHP_VALUE "error_log=/var/log/nginx/application_php_errors.log"; + fastcgi_buffers 16 16k; + fastcgi_buffer_size 32k; + include fastcgi_params; + } +} + +server { + listen 5000 ssl; + server_name socket.alex.eatvio.local; + + ssl_certificate /etc/nginx/socket.alex.eatvio.local+4.pem; + ssl_certificate_key /etc/nginx/socket.alex.eatvio.local+4-key.pem; + ssl_protocols TLSv1.2; + + location / { + proxy_pass http://soketi:6001; + proxy_read_timeout 60; + proxy_connect_timeout 60; + proxy_redirect off; + + # Allow the use of websockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + } + + error_log /dev/stdout info; + access_log /dev/stdout; +} diff --git a/phpdocker/nginx/socket.alex.eatvio.local+4-key.pem b/phpdocker/nginx/socket.alex.eatvio.local+4-key.pem new file mode 100644 index 0000000..922e2fb --- /dev/null +++ b/phpdocker/nginx/socket.alex.eatvio.local+4-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDLhkQ7URIQtK2A +E1xQazxdfzIW6r4mKAnQpBJWbmCylv2/rsjfIEFaNpDIq7uIiR2RqXPlsy9FTaYg +yVLayzI4nDYgmpcoxQhOw9gX9P7O1UX/GS+vDvmsjq0H6Gg+Kb/Cxu7gstbLziXJ +5rdii/INrUHSzbmzdSsUGQyasVz82ify9Wf/gtC/0l23qflK/Tkwj31fTfOMLDch +4irue2HTHUdACKTiH3W9t1U4HMlyT6fOb3199hL3BNdN4s1+dg1nRqo9//lEuO8j +yS8u/an1j+slOo+wuk0EolCJJ7VJos05cET6VRmMcub4g7RImLFUFr+PWV0mMEh6 +ekCDylnDAgMBAAECggEAPpjsUYYs1UCNAJBz2zQwW91sTYojs96qriZYkYbfbO5t +20/p7l6gWxvfSikvw93QX2XMBMEo79rjFsB1IGBQ8QJyz3JcvahkVr17sFqlKH6G +SeC4PtKPTliPtZfwv/XdSg4fmLLIx+R+0OuKSeAbMcOxNCIcVKrb9hGCQ+37WLVA +G2zfKzEg0MDl9I3rA5rmR30rl0V2YDqMOsnQid9k+zG7yFGFmNLiu98VV3bVIgZ6 +7v/LSsjRMaldijn5PSSVvSjq69scJlTF9l+ZB0Mt3M9hF0jRxlFH3Tm304ZUXn1X +M5yHi5paY8qCyxVgnOdkll3W5jowlZMtxTMuv+WDcQKBgQDiRqAhVo9/66SPZbZI +b2Sn1GkaKBZX/FJl9K4DU2/lwXgRZLaa8G2mMiv0UckCTBtOid5ud4LiepJh6rja +ypCtqge4womaBN15cJdDOyYO4vSlyll9bi9+mcpJy7p3NKLaj1Ki1Qrqb3L+GlkH +5/j3uaT0JlmwJ9iCrn1Kq8oeeQKBgQDmQoo0DZ86GMbi6g1m2LOOs16zHtG69gNX +XRvUWK/HEcami7yLbpiOMUKkJA+r26vb7CaM3Xo2gz9TFspY0woUUL0lKaWKecWJ +CmnfxlJaQ19j50t8hYkdaCTczOtLWywzHoE25xKBiVJgw4tw2PjPt7NZo9aN+Dyt +sxVbtj17GwKBgQDaBGR7WrSu8zO+OqkUR8f68O1Hl4JXyjT2KXeUmssA25U9ZQWQ +acGsVUEGidqcDQpudOZNF3eTkbgDAi6UGIKn4WDJQx9jt/ZQ8Qu9ansz8rb4Gux4 +rzaxy6odyl7iRmP3JArh+1UmJrXsYSSROpAm18c4us7FrM6us0LjNHxtOQKBgQDb +zAKe463tyD751k/Kr+reugwY0b+ER1gzKfbpwWqxjR9iVZs6Qe0wNoeVpbKr63pm +6Up3RudlZ+2nw+aN2Y4SjGuxMMsLn2fXg/BCos5zyUIiXGRrThDv2Dzv5FBq03Ii +rejMXtEEg+/13FOb+hGwPnvego3JYX+Sk5M8w352pwKBgFBQp6lwvC9fH4xKlfzR +suWwt/uPb0uo0M6y5uosx1gDOmk86ucU6Ka34U+CLNywAIyaZem9wpRb1JyKCt3/ +SZt4Cs4zwOyr2Kw8QstqKkkSAs2RVfSN4YPM6fkDE59leg/7m5wTj0MW04Rn45mc +Vw15ekSv133tUKximh0t5cvM +-----END PRIVATE KEY----- diff --git a/phpdocker/nginx/socket.alex.eatvio.local+4.pem b/phpdocker/nginx/socket.alex.eatvio.local+4.pem new file mode 100644 index 0000000..61e3f7b --- /dev/null +++ b/phpdocker/nginx/socket.alex.eatvio.local+4.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEQjCCAqqgAwIBAgIRAK/w6zEhYEt/SZPQdtguFKYwDQYJKoZIhvcNAQELBQAw +TzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRIwEAYDVQQLDAlhbGV4 +QGFsZXgxGTAXBgNVBAMMEG1rY2VydCBhbGV4QGFsZXgwHhcNMjQwOTAyMDc0MzM2 +WhcNMjYxMjAyMDc0MzM2WjA9MScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQg +Y2VydGlmaWNhdGUxEjAQBgNVBAsMCWFsZXhAYWxleDCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAMuGRDtREhC0rYATXFBrPF1/MhbqviYoCdCkElZuYLKW +/b+uyN8gQVo2kMiru4iJHZGpc+WzL0VNpiDJUtrLMjicNiCalyjFCE7D2Bf0/s7V +Rf8ZL68O+ayOrQfoaD4pv8LG7uCy1svOJcnmt2KL8g2tQdLNubN1KxQZDJqxXPza +J/L1Z/+C0L/SXbep+Ur9OTCPfV9N84wsNyHiKu57YdMdR0AIpOIfdb23VTgcyXJP +p85vfX32EvcE103izX52DWdGqj3/+US47yPJLy79qfWP6yU6j7C6TQSiUIkntUmi +zTlwRPpVGYxy5viDtEiYsVQWv49ZXSYwSHp6QIPKWcMCAwEAAaOBqjCBpzAOBgNV +HQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAUwcxZ +u77uAlfsP52FQ+10ocE8KqgwXwYDVR0RBFgwVoIYc29ja2V0LmFsZXguZWF0dmlv +LmxvY2Fsghdzb2NrZXQuYWxleC5lYXR2aW8udGVzdIIJbG9jYWxob3N0hwQKNwV5 +hxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBgQCR6GilrCsiKLp0 +0VVaRSktjjjdddnW9QkZ//4JTwWFhadc1HB5enLS6RFFDNoo9LnWeQatK39tiRaN +9o4YPJlx6NcMgHDX0UnVPsyvVQkQ2+5U7nXkdR5XgQIAp8EexPK4g8Sj8pILYSE6 ++If+t6rpB0zCbcMHgInQPohRsCpMzl612G4/lzSjEc7NwAlyyPNXcT1n+YrfR28v +uVRDdSKQkJ8n4XTAJwHN19HomNfrASFG6P02bdd8AZKuNxc+yeucpsTHyAzc6N3Z +xXG2fTwfbTkQbie9guZQRmd7ZERA7usDwGhaAIW/CDNBUvdpFzvYNsp8mv9UhSZF +I8WAOLvLosX+9yiE0SB9sEqIjS1cuZv6jek1wDlU78rOywBUJbeNIB4k8YyPXU3g +MnXEm8qMW60zKWm0Z4ucP5AnbN/938mpJ4DFNH/wuA+bKLEI+cAkMF8BNhMcFZ0U +Jq1l75URBrteimBYxmH4GK5y1l2ZW1I5fBz2PCGj7ZGTHz3J9NQ= +-----END CERTIFICATE-----