From 003ad32fd4f5b08f2108b8ae5e10833fc16a4e34 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 24 Feb 2024 15:00:54 +0100 Subject: [PATCH] Update databases information, add gitignore and composer. --- .drone.yml | 19 +++++ .gitignore | 2 + .htaccess | 2 +- Dockerfile | 7 ++ composer.lock | 180 ++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yaml | 4 +- inc/konstanten.php | 8 +- 7 files changed, 215 insertions(+), 7 deletions(-) create mode 100644 .drone.yml create mode 100644 .gitignore create mode 100644 composer.lock diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..2f52212 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,19 @@ +kind: pipeline +name: default + +steps: + - name: build container + image: plugins/docker + settings: + dockerfile: Dockerfile + username: + from_secret: registry-username + password: + from_secret: registry-password + registry: https://cs-registry.ddnss.de + repo: cs-registry.ddnss.de/${DRONE_REPO_OWNER}/startup + dry_run: false + purge: true + insecure: false + tags: + - ${DRONE_TAG} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..40b341e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/vendor +/.idea \ No newline at end of file diff --git a/.htaccess b/.htaccess index fbf5e7f..36f424f 100644 --- a/.htaccess +++ b/.htaccess @@ -1 +1 @@ -Redirect /inhalte/ http://verwaltung.ri-st.de/index.php?section= +Redirect /inhalte/ https://verwaltung.ri-st.de/index.php?section= diff --git a/Dockerfile b/Dockerfile index a4c8e8c..dd27db1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,13 @@ RUN sed -ri -e 's!upload_max_filesize = 2M!upload_max_filesize = 8M!g' $PHP_INI_ RUN a2enmod rewrite +RUN cd ${APACHE_DOCUMENT_ROOT} +RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" +RUN php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +RUN php composer-setup.php +RUN php -r "unlink('composer-setup.php');" +RUN php composer.phar install --working-dir ${APACHE_DOCUMENT_ROOT} + ARG UNAME=www-data ARG UGROUP=www-data ARG UID=1000 diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..5b3b05d --- /dev/null +++ b/composer.lock @@ -0,0 +1,180 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "6a0769e85a903c4a0fd6971cebefccf7", + "packages": [ + { + "name": "phpmailer/phpmailer", + "version": "v5.2.28", + "source": { + "type": "git", + "url": "https://github.com/PHPMailer/PHPMailer.git", + "reference": "acba50393dd03da69a50226c139722af8b153b11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/acba50393dd03da69a50226c139722af8b153b11", + "reference": "acba50393dd03da69a50226c139722af8b153b11", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "php": ">=5.0.0" + }, + "require-dev": { + "doctrine/annotations": "1.2.*", + "jms/serializer": "0.16.*", + "phpdocumentor/phpdocumentor": "2.*", + "phpunit/phpunit": "4.8.*", + "symfony/debug": "2.8.*", + "symfony/filesystem": "2.8.*", + "symfony/translation": "2.8.*", + "symfony/yaml": "2.8.*", + "zendframework/zend-cache": "2.5.1", + "zendframework/zend-config": "2.5.1", + "zendframework/zend-eventmanager": "2.5.1", + "zendframework/zend-filter": "2.5.1", + "zendframework/zend-i18n": "2.5.1", + "zendframework/zend-json": "2.5.1", + "zendframework/zend-math": "2.5.1", + "zendframework/zend-serializer": "2.5.*", + "zendframework/zend-servicemanager": "2.5.*", + "zendframework/zend-stdlib": "2.5.1" + }, + "suggest": { + "league/oauth2-google": "Needed for Google XOAUTH2 authentication" + }, + "type": "library", + "autoload": { + "classmap": [ + "class.phpmailer.php", + "class.phpmaileroauth.php", + "class.phpmaileroauthgoogle.php", + "class.smtp.php", + "class.pop3.php", + "extras/EasyPeasyICS.php", + "extras/ntlm_sasl_client.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Marcus Bointon", + "email": "phpmailer@synchromedia.co.uk" + }, + { + "name": "Jim Jagielski", + "email": "jimjag@gmail.com" + }, + { + "name": "Andy Prevost", + "email": "codeworxtech@users.sourceforge.net" + }, + { + "name": "Brent R. Matzelle" + } + ], + "description": "PHPMailer is a full-featured email creation and transfer class for PHP", + "support": { + "issues": "https://github.com/PHPMailer/PHPMailer/issues", + "source": "https://github.com/PHPMailer/PHPMailer/tree/v5.2.28" + }, + "funding": [ + { + "url": "https://marcus.bointon.com/donations/", + "type": "custom" + }, + { + "url": "https://github.com/Synchro", + "type": "github" + }, + { + "url": "https://www.patreon.com/marcusbointon", + "type": "patreon" + } + ], + "time": "2020-03-19T14:29:37+00:00" + }, + { + "name": "tecnickcom/tcpdf", + "version": "6.2.12", + "source": { + "type": "git", + "url": "https://github.com/tecnickcom/TCPDF.git", + "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f", + "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "fonts", + "config", + "include", + "tcpdf.php", + "tcpdf_parser.php", + "tcpdf_import.php", + "tcpdf_barcodes_1d.php", + "tcpdf_barcodes_2d.php", + "include/tcpdf_colors.php", + "include/tcpdf_filters.php", + "include/tcpdf_font_data.php", + "include/tcpdf_fonts.php", + "include/tcpdf_images.php", + "include/tcpdf_static.php", + "include/barcodes/datamatrix.php", + "include/barcodes/pdf417.php", + "include/barcodes/qrcode.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPLv3" + ], + "authors": [ + { + "name": "Nicola Asuni", + "email": "info@tecnick.com", + "homepage": "http://nicolaasuni.tecnick.com" + } + ], + "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", + "homepage": "http://www.tcpdf.org/", + "keywords": [ + "PDFD32000-2008", + "TCPDF", + "barcodes", + "datamatrix", + "pdf", + "pdf417", + "qrcode" + ], + "support": { + "source": "https://github.com/tecnickcom/TCPDF/tree/6.2.12" + }, + "time": "2015-09-12T10:08:34+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/docker-compose.yaml b/docker-compose.yaml index 848a963..dee8ed2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -26,8 +26,8 @@ services: networks: - startup environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_PASSWORD: lmaa,dw. + MYSQL_ROOT_PASSWORD: 7PtL4UGRkUnT753SrZQE9dpZt3aV745J + MYSQL_PASSWORD: WL5U6tnGYRm3t5iS2294PHVY4C55KuEL MYSQL_USER: startup MYSQL_DATABASE: startup diff --git a/inc/konstanten.php b/inc/konstanten.php index 1f7cb39..d8b2d08 100644 --- a/inc/konstanten.php +++ b/inc/konstanten.php @@ -1,6 +1,6 @@