Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ REDIS_QUEUE={default}
USE_ZANICHELLI_IDP=true
VITE_SHOW_LOGOUT="${USE_ZANICHELLI_IDP}"

IDP_URL=
IDP_TOKEN_URL=
IDP_LOGOUT_URL=
IDP_BASE_URL=
IDP_COOKIE_NAME=

TELESCOPE_ENABLED=true
TELESCOPE_CACHE_WATCHER=true
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/production.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
project_url: buzzer.zanichelli.it
idp_url: idp.zanichelli.it
idp_cookie_name: token
env_param: "production"
email_from: [email protected]
1 change: 1 addition & 0 deletions ansible/group_vars/staging.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
project_url: buzzer-test.zanichelli.it
idp_url: idp-test.zanichelli.it
idp_cookie_name: token_test
env_param: "staging"
email_from: [email protected]
5 changes: 2 additions & 3 deletions ansible/roles/deploy-buzzer/templates/.env.j2
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
USE_ZANICHELLI_IDP=true
VITE_SHOW_LOGOUT="${USE_ZANICHELLI_IDP}"

IDP_URL=https://{{ idp_url }}/loginForm
IDP_TOKEN_URL=https://{{ idp_url }}/v1/user
IDP_LOGOUT_URL=https://{{ idp_url }}/v1/logout
IDP_BASE_URL=https://{{ idp_url }}
IDP_COOKIE_NAME={{ idp_cookie_name }}

TELESCOPE_ENABLED=false
TELESCOPE_CACHE_WATCHER=true
Expand Down
2 changes: 1 addition & 1 deletion app-prod.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM php:8.4-fpm

RUN apt-get update && apt-get install -y wget libmcrypt-dev mariadb-client \
xvfb libfontconfig wkhtmltopdf libxslt1-dev libgtk2.0-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 gnupg libcanberra-gtk-module\
xvfb libfontconfig libxslt1-dev libgtk2.0-0 libnotify-dev libnss3 libxss1 libasound2 gnupg\
openssl zip unzip git nano wget libaio-dev iputils-ping

RUN docker-php-ext-configure pcntl --enable-pcntl && docker-php-ext-install pcntl
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"laravel/tinker": "^2.0",
"laravel/ui": "^4.0",
"zanichelli/healthcheck": "^1.1",
"zanichelli/idp-extensions": "^3.7",
"zanichelli/idp-extensions": "^3.8",
"zircote/swagger-php": "4.*"
},
"require-dev": {
Expand Down
15 changes: 8 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ services:
max-size: 5m
max-file: "3"
database:
image: mysql:8
image: mysql:8.4.5
container_name: buzzer_db
environment:
- "MYSQL_ROOT_PASSWORD=secret"
Expand Down
Loading