diff --git a/.github/workflows/aws-cicd-dev.yml b/.github/workflows/aws-cicd-dev.yml index bb0b5251..2cfd711b 100644 --- a/.github/workflows/aws-cicd-dev.yml +++ b/.github/workflows/aws-cicd-dev.yml @@ -4,9 +4,11 @@ on: push: branches: - develop + - chore/LA-33 pull_request: branches: - develop + - chore/LA-33 env: REGISTRY: "docker.io" NAMESPACE: "clean01" diff --git a/.github/workflows/aws-cicd-prod.yml b/.github/workflows/aws-cicd-prod.yml index bd5ac099..30227249 100644 --- a/.github/workflows/aws-cicd-prod.yml +++ b/.github/workflows/aws-cicd-prod.yml @@ -4,11 +4,11 @@ on: push: branches: - main - - chore/LA-33 +# - chore/LA-33 pull_request: branches: - main - - chore/LA-33 +# - chore/LA-33 env: REGISTRY: "docker.io" @@ -25,8 +25,6 @@ jobs: deploy_target: ${{ steps.set-env.outputs.DEPLOY_TARGET }} steps: - - - name: Setup Env id: set-env run: | diff --git a/layer-api/infra/development/application.yml b/layer-api/infra/development/application.yml deleted file mode 100644 index bb74f7fd..00000000 --- a/layer-api/infra/development/application.yml +++ /dev/null @@ -1,66 +0,0 @@ -server: - port: 8085 - -spring: - config: - import: application-secret.properties - datasource: - url: ${AWS_PROD_DB_URL} - username: ${AWS_PROD_DB_NAME} - password: ${AWS_PROD_DB_PASSWORD} - driver-class-name: com.mysql.cj.jdbc.Driver - jpa: - hibernate: - ddl-auto: update - properties: - hibernate: - format_sql: true - show_sql: true - open-in-view: false - database: mysql - -apple: - login: - issuer: ${DEV_APPLE_ISSUER} - client_id: ${DEV_APPLE_CLIENT_ID} - audience: ${DEV_APPLE_AUD} - -kakao: - login: - api_key: ${DEV_KAKAO_API_KEY} - redirect_uri: ${DEV_KAKAO_REDIRECT_URI} - uri: - base: https://kauth.kakao.com - code: /oauth/authorize - token: /oauth/token - api: - uri: - base: https://kapi.kakao.com - user: /v2/user/me - -google: - login: - client_id: ${DEV_GOOGLE_CLIENT_ID} - code_uri: ${DEV_GOOGLE_CODE_URI} - token_uri: ${DEV_GOOGLE_TOKEN_URI} - client_secret: ${DEV_GOOGLE_CLIENT_SECRET} - redirect_uri: ${DEV_GOOGLE_REDIRECT_URI} - code_redirect_uri: http://localhost:8080/api/auth/oauth2/google/code - sheet: - id: ${GOOGLE_SHEET_ID} - token_path: ${PROD_GOOGLE_TOKEN_PATH} - credential_path: ${PROD_GOOGLE_CREDENTIAL_PATH} - -ncp: - storage: - region: ${STORAGE_REGION} - bucketName: ${STORAGE_NAME} - endpoint: ${STORAGE_ENDPOINT} - accessKey: ${STORAGE_ACCESS_KEY} - secretKey: ${STORAGE_SECRET_KEY} - -openai: - systemContent: ${OPENAI_SYSTEM_CONTENT} - apiKey: ${OPENAI_API_KEY} - model: ${OPENAI_MODEL} - maxTokens: ${OPENAI_MAX_TOKENS} \ No newline at end of file diff --git a/layer-api/infra/development/nginx.blue.conf b/layer-api/infra/development/nginx.blue.conf index d8486355..e5f5348a 100644 --- a/layer-api/infra/development/nginx.blue.conf +++ b/layer-api/infra/development/nginx.blue.conf @@ -12,7 +12,7 @@ http { # api.layerapp.io에 대한 서버 블록 server { listen 80; - server_name api.layerapp.io; + server_name stgapi.layerapp.io; location / { proxy_pass http://layer-api; @@ -26,7 +26,7 @@ http { # admin.api.layerapp.io에 대한 서버 블록 server { listen 80; - server_name admin-prod.layerapp.io; + server_name admin-dev.layerapp.io; location / { proxy_pass http://layer-admin; diff --git a/layer-api/infra/development/nginx.green.conf b/layer-api/infra/development/nginx.green.conf index f03454f1..fcab1cc4 100644 --- a/layer-api/infra/development/nginx.green.conf +++ b/layer-api/infra/development/nginx.green.conf @@ -12,7 +12,7 @@ http { # api.layerapp.io에 대한 서버 블록 server { listen 80; - server_name api.layerapp.io; + server_name stgapi.layerapp.io; location / { proxy_pass http://layer-api; @@ -26,7 +26,7 @@ http { # admin.api.layerapp.io에 대한 서버 블록 server { listen 80; - server_name admin-prod.layerapp.io; + server_name admin-dev.layerapp.io; location / { proxy_pass http://layer-admin;