diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f99d47..65d87c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: - master - - staging + - staging_new jobs: build: diff --git a/.monitoring/prometheus/prometheus.yml b/.monitoring/prometheus/prometheus.yml index 65a8525..5351bc2 100644 --- a/.monitoring/prometheus/prometheus.yml +++ b/.monitoring/prometheus/prometheus.yml @@ -7,6 +7,6 @@ scrape_configs: metrics_path: '/actuator/prometheus' scrape_interval: 3s static_configs: - - targets: ['host.docker.internal:8080'] + - targets: ['host.docker.internal:80'] labels: application: 'snackscription_subscriptionbox' diff --git a/.monitoring/docker-compose.yml b/docker-compose.yml similarity index 71% rename from .monitoring/docker-compose.yml rename to docker-compose.yml index e8170cf..535e2ce 100644 --- a/.monitoring/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - "9090:9090" volumes: - - ./monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml + - ./.monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml grafana: image: grafana/grafana:9.5.2 @@ -23,4 +23,4 @@ services: - "3000:3000" restart: unless-stopped volumes: - - ./monitoring/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources \ No newline at end of file + - ./.monitoring/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources \ No newline at end of file diff --git a/src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/config/SecurityConfig.java b/src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/config/SecurityConfig.java index 41f7678..047006c 100644 --- a/src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/config/SecurityConfig.java +++ b/src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/config/SecurityConfig.java @@ -28,6 +28,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws authorizeRequests .requestMatchers("/actuator/prometheus").permitAll() // Allow unauthenticated access .requestMatchers("/subscription-box/**", "/public/**").permitAll() + .requestMatchers("/").permitAll() .anyRequest().authenticated()) .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .addFilterBefore(new JWTAuthFilter(jwtUtils), UsernamePasswordAuthenticationFilter.class);