From: Vincent Vanwaelscappel Date: Fri, 21 Mar 2025 12:10:28 +0000 (+0100) Subject: wip #7409 @6 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1c5530eab448912797ec67d2016529d65587f249;p=prescription-quotidien.git wip #7409 @6 --- diff --git a/.docker/config/composer/auth.json b/.docker/config/composer/auth.json new file mode 100644 index 0000000..6b9274a --- /dev/null +++ b/.docker/config/composer/auth.json @@ -0,0 +1,5 @@ +{ + "github-oauth": { + "github.com": "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" + } +} diff --git a/.docker/dev/update b/.docker/dev/update index 31371fe..fb3f201 100644 --- a/.docker/dev/update +++ b/.docker/dev/update @@ -9,5 +9,7 @@ chown -R 999:999 ./redis COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build -docker compose down +docker compose down -v docker compose up -d + +ufw-docker allow presquot diff --git a/.docker/images/php-5.6-fpm/Dockerfile b/.docker/images/php-5.6-fpm/Dockerfile deleted file mode 100644 index 67be083..0000000 --- a/.docker/images/php-5.6-fpm/Dockerfile +++ /dev/null @@ -1,82 +0,0 @@ -FROM ubuntu:jammy AS cli - -WORKDIR "/application" - -# Fixes some weird terminal issues such as broken clear / CTRL+L -ENV TERM=linux - -# Install Ondrej repos for Ubuntu Bionic, PHP7.2, composer and selected extensions - better selection than -# the distro's packages -RUN apt-get update \ - && apt-get install -y --no-install-recommends gnupg \ - && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \ - && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \ - && apt-get update \ - && apt-get update \ - && apt-get -y --no-install-recommends install \ - curl \ - ca-certificates \ - unzip \ - php5.6-cli \ - php5.6-curl \ - php5.6-json \ - php5.6-mbstring \ - php5.6-opcache \ - php5.6-readline \ - php5.6-xml \ - php5.6-zip \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* - -COPY --from=composer:2 /usr/bin/composer /usr/bin/composer - -CMD ["php", "-a"] - -# If you'd like to be able to use this container on a docker-compose environment as a quiescent PHP CLI container -# you can /bin/bash into, override CMD with the following - bear in mind that this will make docker-compose stop -# slow on such a container, docker-compose kill might do if you're in a hurry -# CMD ["tail", "-f", "/dev/null"] - -FROM cli AS fpm - -# Install FPM -RUN export DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get -y --no-install-recommends install php5.6-fpm \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* - -# PHP-FPM packages need a nudge to make them docker-friendly -COPY overrides.conf /etc/php/5.6/fpm/pool.d/z-overrides.conf - -# PHP-FPM has really dirty logs, certainly not good for dockerising -# The following startup script contains some magic to clean these up -COPY --chmod=755 php-fpm-startup /usr/bin/php-fpm -CMD /usr/bin/php-fpm - -# Open up fcgi port -EXPOSE 9000 - -RUN apt-get update; \ - apt-get -y --no-install-recommends install \ - git \ - php5.6-bz2 \ - php5.6-gd \ - php5.6-igbinary \ - php5.6-imap \ - php5.6-imagick \ - php5.6-intl \ - php5.6-memcached \ - php5.6-mysql \ - php5.6-redis \ - php5.6-soap \ - php5.6-ssh2 \ - php5.6-tidy \ - php5.6-xsl \ - php5.6-curl \ - php5.6-json \ - php5.6-mcrypt \ - less nano wget curl \ - sudo openssh-server rsyslog cron mariadb-client; \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; diff --git a/.docker/images/php-5.6-fpm/overrides.conf b/.docker/images/php-5.6-fpm/overrides.conf deleted file mode 100644 index 51c835c..0000000 --- a/.docker/images/php-5.6-fpm/overrides.conf +++ /dev/null @@ -1,17 +0,0 @@ -[global] -; Override default pid file -pid = /run/php-fpm.pid - -; Avoid logs being sent to syslog -error_log = /proc/self/fd/2 - -[www] -; Access from webserver container is via network, not socket file -listen = [::]:9000 - -; Redirect logs to stdout - FPM closes /dev/std* on startup -access.log = /proc/self/fd/2 -catch_workers_output = yes - -; Required to allow config-by-environment -clear_env = no diff --git a/.docker/images/php-5.6-fpm/php-fpm-startup b/.docker/images/php-5.6-fpm/php-fpm-startup deleted file mode 100644 index 587aa8c..0000000 --- a/.docker/images/php-5.6-fpm/php-fpm-startup +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# Set file rights -umask 0000 -chmod -R 777 /tmp - -chown -R root:root /etc/sudoers.d -chown -R presquot:www-data /application - -# Rsyslog -start-stop-daemon --start -b -x /usr/sbin/rsyslogd -- -n - -# SSH Server -ssh-keygen -A -chmod 755 /etc/ssh/*.d -chmod 600 /etc/ssh/*_key -chmod 750 /application -#chmod 600 /application/.ssh/id_rsa -chmod 700 /application/.ssh/ -chmod 600 /application/.ssh/authorized_keys2 -#chmod 600 /root/.ssh/id_rsa -chmod 700 /root/.ssh/ -chmod 600 /root/.ssh/authorized_keys2 -/usr/sbin/service ssh start - -# Cron -chmod 0644 /etc/crontab && crontab -u root /etc/crontab && /usr/sbin/service cron start - -# Set user password -chpasswd < /root/passwords - -# Launch PHP -/usr/sbin/php-fpm5.6 -F -O 2>&1 | sed -u 's,.*: \"\(.*\)$,\1,'| sed -u 's,"$,,' 1>&1 diff --git a/.docker/images/php-fpm/Dockerfile b/.docker/images/php-fpm/Dockerfile index a9d18b4..460fe80 100644 --- a/.docker/images/php-fpm/Dockerfile +++ b/.docker/images/php-fpm/Dockerfile @@ -20,7 +20,7 @@ RUN apt update \ # Add Nodejs Repository RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list RUN apt update @@ -73,7 +73,7 @@ STOPSIGNAL SIGQUIT RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 presquot # PHP-FPM packages need a nudge to make them docker-friendly -COPY overrides.conf /etc/php/8.3/fpm/pool.d/z-overrides.conf +COPY overrides.conf /etc/php/8.33/fpm/pool.d/z-overrides.conf COPY --chmod=755 startup /usr/bin/startup CMD exec /usr/bin/startup diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml index d421c78..28c9a82 100644 --- a/.docker/production/docker-compose.yml +++ b/.docker/production/docker-compose.yml @@ -9,11 +9,12 @@ services: - './www/:/application/' - './www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' environment: - VIRTUAL_HOST: presquot.dev.cubedesigners.com - LETSENCRYPT_HOST: presquot.dev.cubedesigners.com + VIRTUAL_HOST: dev.prescription-quotidien.com, admin.dev.prescription-quotidien.com + LETSENCRYPT_HOST: dev.prescription-quotidien.com, admin.dev.prescription-quotidien.com networks: - presquot restart: unless-stopped + php-fpm: container_name: presquot hostname: presquot @@ -56,8 +57,8 @@ services: restart: unless-stopped environment: ADMINER_DEFAULT_SERVER: presquot-mariadb - VIRTUAL_HOST: adminer.www.presquot.dev.cubedesigners.com - LETSENCRYPT_HOST: adminer.www.presquot.dev.cubedesigners.com + VIRTUAL_HOST: adminer.dev.prescription-quotidien.com + LETSENCRYPT_HOST: adminer.dev.prescription-quotidien.com networks: - presquot diff --git a/.docker/production/update b/.docker/production/update index 2ea13e6..af677e9 100644 --- a/.docker/production/update +++ b/.docker/production/update @@ -9,7 +9,7 @@ chown -R 999:999 ./redis COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build -docker compose down +docker compose down -v docker compose up -d ufw-docker allow presquot diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..f39439f --- /dev/null +++ b/.env.production @@ -0,0 +1,56 @@ +APP_NAME=presquot +APP_ENV=production +APP_KEY=base64:EsUHiiae3DsF55VrffWQLNZ+DB+YNs6giTCy55w0eoo= +APP_DEBUG=true +APP_URL=https://dev.prescription-quotidien.com +LOG_CHANNEL=stack +LOG_DEPRECATIONS_CHANNEL=null +LOG_LEVEL=debug +DB_CONNECTION=mysql +DB_HOST=presquot-mariadb +DB_PORT=3306 +DB_DATABASE=presquot +DB_USERNAME=root +DB_PASSWORD=35z8556x1KVZ8p3q +BROADCAST_DRIVER=log +CACHE_DRIVER=redis +FILESYSTEM_DISK=local +QUEUE_CONNECTION=database +SESSION_DRIVER=redis +SESSION_LIFETIME=1200 +MEMCACHED_HOST=127.0.0.1 +REDIS_HOST=presquot-redis +REDIS_PASSWORD=null +REDIS_PORT=6379 +MAIL_MAILER=smtp +MAIL_HOST=postal.cubedesigners.com +MAIL_PORT=25 +MAIL_USERNAME=opra/presquot-dev +MAIL_PASSWORD=CtQZ7SJEDclMuIBpzlbQBC1z +MAIL_ENCRYPTION=false +MAIL_FROM_ADDRESS=dev@prescription-quotidien.com +MAIL_FROM_NAME="Prescription Quotidien" +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= +AWS_USE_PATH_STYLE_ENDPOINT=false +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_HOST= +PUSHER_PORT=443 +PUSHER_SCHEME=https +PUSHER_APP_CLUSTER=mt1 +VITE_APP_NAME=Laravel +VITE_PUSHER_APP_KEY= +VITE_PUSHER_HOST= +VITE_PUSHER_PORT=443 +VITE_PUSHER_SCHEME=https +VITE_PUSHER_APP_CLUSTER=mt1 +DEBUGBAR_ENABLED=true +DEBUGBAR_OPEN_STORAGE=true +MAIL_BCC_ALL=test+presquot@cubedesigners.com +BACKPACK_LOCALES=en,fr +TIMEZONE=Europe/Paris +POWERED_BY_LINK=https://www.cubedesigners.com/ diff --git a/.gitignore b/.gitignore index 7fe978f..de72ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,13 +5,9 @@ /public/storage /storage/*.key /vendor -.env -.env.backup -.env.production .phpunit.result.cache Homestead.json Homestead.yaml -auth.json npm-debug.log yarn-error.log /.fleet diff --git a/README.md b/README.md deleted file mode 100644 index 1a4c26b..0000000 --- a/README.md +++ /dev/null @@ -1,66 +0,0 @@ -

Laravel Logo

- -

-Build Status -Total Downloads -Latest Stable Version -License -

- -## About Laravel - -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: - -- [Simple, fast routing engine](https://laravel.com/docs/routing). -- [Powerful dependency injection container](https://laravel.com/docs/container). -- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage. -- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent). -- Database agnostic [schema migrations](https://laravel.com/docs/migrations). -- [Robust background job processing](https://laravel.com/docs/queues). -- [Real-time event broadcasting](https://laravel.com/docs/broadcasting). - -Laravel is accessible, powerful, and provides tools required for large, robust applications. - -## Learning Laravel - -Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. - -You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch. - -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains thousands of video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. - -## Laravel Sponsors - -We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the [Laravel Partners program](https://partners.laravel.com). - -### Premium Partners - -- **[Vehikl](https://vehikl.com/)** -- **[Tighten Co.](https://tighten.co)** -- **[WebReinvent](https://webreinvent.com/)** -- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** -- **[64 Robots](https://64robots.com)** -- **[Curotec](https://www.curotec.com/services/technologies/laravel/)** -- **[Cyber-Duck](https://cyber-duck.co.uk)** -- **[DevSquad](https://devsquad.com/hire-laravel-developers)** -- **[Jump24](https://jump24.co.uk)** -- **[Redberry](https://redberry.international/laravel/)** -- **[Active Logic](https://activelogic.com)** -- **[byte5](https://byte5.de)** -- **[OP.GG](https://op.gg)** - -## Contributing - -Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). - -## Code of Conduct - -In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct). - -## Security Vulnerabilities - -If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed. - -## License - -The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). diff --git a/auth.json b/auth.json new file mode 100644 index 0000000..54bf14a --- /dev/null +++ b/auth.json @@ -0,0 +1,8 @@ +{ + "http-basic": { + "backpackforlaravel.com": { + "username": "cubedesigners23627297", + "password": "m4iLNaqzuFer" + } + } +}