diff --git a/.docker/dev/nginx/cgk-streaming-roster.conf b/.docker/dev/nginx/cgk-streaming-roster.conf index dc0ca05..098b242 100644 --- a/.docker/dev/nginx/cgk-streaming-roster.conf +++ b/.docker/dev/nginx/cgk-streaming-roster.conf @@ -3,7 +3,7 @@ server { listen 80; server_name localhost; - root /var/www/cgk-streaming-roster/public; + root /var/www/cgk-rooster-streamen/public; index index.php index.html; location / { @@ -12,12 +12,12 @@ server { location ~ \.php$ { include fastcgi_params; - fastcgi_pass php-cgk-streaming-roster:9000; + fastcgi_pass php-cgk-rooster-streamen:9000; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; fastcgi_param DOCUMENT_ROOT $realpath_root; fastcgi_param HTTP_COOKIE $http_cookie; } - error_log /var/log/nginx/cgk-streaming-roster-error.log; - access_log /var/log/nginx/cgk-streaming-roster-access.log; + error_log /var/log/nginx/cgk-rooster-streamen-error.log; + access_log /var/log/nginx/cgk-rooster-streamen-access.log; } \ No newline at end of file diff --git a/.docker/docker-entrypoint.d/050-database-setup.sh b/.docker/docker-entrypoint.d/050-database-setup.sh index 5c5dd24..723c904 100644 --- a/.docker/docker-entrypoint.d/050-database-setup.sh +++ b/.docker/docker-entrypoint.d/050-database-setup.sh @@ -2,7 +2,7 @@ echo -e "\033[36;01m+ Executing migrations\033[0m" -/var/www/cgk-streaming-roster/bin/console doctrine:migrations:migrate --no-interaction +/var/www/cgk-rooster-streamen/bin/console doctrine:migrations:migrate --no-interaction if [ $? -ne 0 ]; then echo -e "\033[0;31mAn error occurred when executing migrations.\033[0m" fi diff --git a/Dockerfile b/Dockerfile index be854f4..b9a5e3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM php:8.3-fpm # Set working directory -WORKDIR /var/www/cgk-streaming-roster +WORKDIR /var/www/cgk-rooster-streamen # Install required system dependencies RUN apt-get update && apt-get install -y \ diff --git a/Dockerfile-prod b/Dockerfile-prod index a58d5b1..38b7737 100644 --- a/Dockerfile-prod +++ b/Dockerfile-prod @@ -43,7 +43,7 @@ RUN npm install && npm run build FROM php:8.3-fpm # Set working directory -WORKDIR /var/www/cgk-streaming-roster +WORKDIR /var/www/cgk-rooster-streamen # Install required PHP extensions (must be in runtime) RUN apt-get update && apt-get install -y \ diff --git a/README.md b/README.md index 24f843f..980b9f5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# cgk-streaming-roster +# cgk-rooster-streamen -Streaming roster for CGK Leerdam - keeping track of who is streaming when. +Roster for streaming for CGK Leerdam - keeping track of who is streaming when. ### Prerequisites If you actually want to develop on this, you'll need a Nginx container to serve the requests, and a Postgres container as database. @@ -11,10 +11,10 @@ You can use the following configuration in a `compose.override.yaml` file: ``` services: nginx: - container_name: 'cgk-streaming-roster-nginx' + container_name: 'cgk-rooster-streamen-nginx' image: nginx:1.27-alpine networks: - - 'cgk-streaming-roster-network' + - 'cgk-rooster-streamen-network' ports: - "80:80" volumes: @@ -22,16 +22,16 @@ services: - ./docker/dev/nginx:/etc/nginx/conf.d/ postgres: - container_name: 'cgk-streaming-roster-database' + container_name: 'cgk-rooster-streamen-database' image: postgres:17-alpine environment: - POSTGRES_USER: cgk-streaming-roster + POSTGRES_USER: cgk-rooster-streamen POSTGRES_PASSWORD: mypassword POSTGRES_INITDB_ARGS: "--encoding=UTF8" ports: - "5432:5432" networks: - - 'cgk-streaming-roster-network' + - 'cgk-rooster-streamen-network' healthcheck: test: [ "CMD", "pg_isready", "-d", "${POSTGRES_USER}", "-U", "${POSTGRES_USER}" ] interval: 10s @@ -41,12 +41,12 @@ services: volumes: - ./docker/volumes/postgres/data:/var/lib/postgresql/data:rw - php-cgk-streaming-roster: + php-cgk-rooster-streamen: networks: - - 'cgk-streaming-roster-network' + - 'cgk-rooster-streamen-network' networks: - cgk-streaming-roster-network + cgk-rooster-streamen-network driver: bridge ``` diff --git a/compose.yaml b/compose.yaml index 5a0bab1..9175cd2 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,9 +1,9 @@ services: - php-cgk-streaming-roster: + php-cgk-rooster-streamen: build: ./Dockerfile - container_name: 'php-cgk-streaming-roster' + container_name: 'php-cgk-rooster-streamen' volumes: - - .:/var/www/cgk-streaming-roster + - .:/var/www/cgk-rooster-streamen networks: - 'b7d_shared' diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 29fc953..9cf3715 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -7,6 +7,7 @@ framework: # Enables session support. Note that the session will ONLY be started if you read or write from it. # Remove or comment this section to explicitly disable session support. + trusted_proxies: '0.0.0.0/0' session: handler_id: null cookie_secure: auto