diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config deleted file mode 100644 index fd90f5c8..00000000 --- a/.ebextensions/00-makeFiles.config +++ /dev/null @@ -1,12 +0,0 @@ -files: - "/sbin/appstart" : - mode: "000755" - owner: webapp - group: webapp - content: | - #!/usr/bin/env bash - JAR_PATH=/var/app/current/application.jar - - # run app - killall java - java -Dfile.encoding=UTF-8 -jar $JAR_PATH --spring.profiles.active=devrds \ No newline at end of file diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6439f210..c3e0086d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -54,9 +54,9 @@ jobs: run: | mkdir -p deploy cp build/libs/*.jar deploy/application.jar - cp Procfile deploy/Procfile - cp -r .ebextensions deploy/.ebextensions - cp -r .platform deploy/.platform + cp ./server-config/deploy/Procfile deploy/Procfile + cp -r ./server-config/deploy/.ebextensions deploy/.ebextensions + cp -r ./server-config/deploy/.platform deploy/.platform cd deploy && zip -r deploy.zip . - name: Beanstalk Deploy diff --git a/.platform/nginx/nginx.conf b/.platform/nginx/nginx.conf deleted file mode 100644 index af31e103..00000000 --- a/.platform/nginx/nginx.conf +++ /dev/null @@ -1,56 +0,0 @@ -user nginx; -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; -worker_processes auto; -worker_rlimit_nofile 33282; - -events { - use epoll; - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include conf.d/*.conf; - - map $http_upgrade $connection_upgrade { - default "upgrade"; - } - - upstream springboot { - server 127.0.0.1:8080; - keepalive 1024; - } - - server { - listen 80 default_server; - - location / { - proxy_pass http://springboot; - proxy_http_version 1.1; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Upgrade $http_upgrade; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - - access_log /var/log/nginx/access.log main; - - client_header_timeout 60; - client_body_timeout 60; - keepalive_timeout 60; - gzip off; - gzip_comp_level 4; - - # Include the Elastic Beanstalk generated locations - include conf.d/elasticbeanstalk/healthd.conf; - } -} \ No newline at end of file diff --git a/Procfile b/Procfile deleted file mode 100644 index 58dab8d4..00000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: appstart \ No newline at end of file diff --git a/server-config b/server-config index 267bffdc..5ec328c8 160000 --- a/server-config +++ b/server-config @@ -1 +1 @@ -Subproject commit 267bffdc2ad657351d25233a7a5a3af49ce0316e +Subproject commit 5ec328c89cfbe72aa8f448d5bb8fbdea6c55ce11