mirror of
https://github.com/DanielnetoDotCom/YouPHPTube
synced 2025-10-03 01:39:24 +02:00
Merge origin/master
This commit is contained in:
DanieL
commit
4fbf687c2f
5 changed files with 103 additions and 103 deletions
24
composer.lock
generated
24
composer.lock
generated
|
|
@ -119,16 +119,16 @@
|
|||
},
|
||||
{
|
||||
"name": "aws/aws-sdk-php",
|
||||
"version": "3.229.1",
|
||||
"version": "3.229.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||
"reference": "5cffc0b16d1f33029628586313e9cf140f18b06d"
|
||||
"reference": "142a872fd7172bf5d067f4e30e4f89593296fc8f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5cffc0b16d1f33029628586313e9cf140f18b06d",
|
||||
"reference": "5cffc0b16d1f33029628586313e9cf140f18b06d",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/142a872fd7172bf5d067f4e30e4f89593296fc8f",
|
||||
"reference": "142a872fd7172bf5d067f4e30e4f89593296fc8f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -204,9 +204,9 @@
|
|||
"support": {
|
||||
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
|
||||
"issues": "https://github.com/aws/aws-sdk-php/issues",
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.229.1"
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.229.2"
|
||||
},
|
||||
"time": "2022-06-30T18:16:30+00:00"
|
||||
"time": "2022-07-01T18:16:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "cboden/ratchet",
|
||||
|
|
@ -774,16 +774,16 @@
|
|||
},
|
||||
{
|
||||
"name": "google/apiclient-services",
|
||||
"version": "v0.255.0",
|
||||
"version": "v0.256.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
||||
"reference": "2b895ceb08eb106f65e975221e5d2e971cf7470e"
|
||||
"reference": "122e51021eb19b53f831904918460671d1e7259d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2b895ceb08eb106f65e975221e5d2e971cf7470e",
|
||||
"reference": "2b895ceb08eb106f65e975221e5d2e971cf7470e",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/122e51021eb19b53f831904918460671d1e7259d",
|
||||
"reference": "122e51021eb19b53f831904918460671d1e7259d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -812,9 +812,9 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.255.0"
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.256.0"
|
||||
},
|
||||
"time": "2022-06-27T01:30:11+00:00"
|
||||
"time": "2022-07-04T01:10:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "google/auth",
|
||||
|
|
|
|||
|
|
@ -1,75 +1,75 @@
|
|||
#!/bin/bash
|
||||
|
||||
echo "Starting AVideo Platform..."
|
||||
CONFIG_FILE=/etc/apache2/sites-enabled/000-default.conf
|
||||
|
||||
if [ "_${CREATE_TLS_CERTIFICATE}_" == "_yes_" ]; then
|
||||
echo "Generate Certificate..."
|
||||
echo "Certificate file: ${TLS_CERTIFICATE_FILE}"
|
||||
echo "Certificate key: ${TLS_CERTIFICATE_KEY}"
|
||||
|
||||
mkdir -p `dirname ${TLS_CERTIFICATE_FILE}`
|
||||
mkdir -p `dirname ${TLS_CERTIFICATE_KEY}`
|
||||
subjectAltName="IP:127.0.0.1,DNS:${SERVER_NAME}"
|
||||
|
||||
CONFIG=""
|
||||
CONFIG="${CONFIG}[dn]\n"
|
||||
CONFIG="${CONFIG}C=NN\n"
|
||||
CONFIG="${CONFIG}L=Earth\n"
|
||||
CONFIG="${CONFIG}O=AVideo\n"
|
||||
CONFIG="${CONFIG}OU=Development\n"
|
||||
CONFIG="${CONFIG}CN=localhost\n"
|
||||
CONFIG="${CONFIG}\n"
|
||||
CONFIG="${CONFIG}[req]\n"
|
||||
CONFIG="${CONFIG}distinguished_name=dn\n"
|
||||
CONFIG="${CONFIG}\n"
|
||||
CONFIG="${CONFIG}[EXT]\n"
|
||||
CONFIG="${CONFIG}subjectAltName=${subjectAltName}\n"
|
||||
CONFIG="${CONFIG}extendedKeyUsage=serverAuth\n"
|
||||
CONFIG="${CONFIG}\n"
|
||||
|
||||
openssl req -x509 \
|
||||
-out ${TLS_CERTIFICATE_FILE} -keyout ${TLS_CERTIFICATE_KEY} \
|
||||
-newkey rsa:4096 \
|
||||
-nodes \
|
||||
-sha256 \
|
||||
-days 3650 \
|
||||
-subj '/C=NN/L=Earth/O=avideo/OU=DEV/CN=localhost' \
|
||||
-extensions EXT -config <( \
|
||||
printf "${CONFIG}")
|
||||
|
||||
echo "New Certificate config..."
|
||||
openssl x509 -in ${TLS_CERTIFICATE_FILE} -noout -text || true
|
||||
fi
|
||||
|
||||
echo "Configure Apache..."
|
||||
sed -i 's#SERVER_NAME#'${SERVER_NAME}'#' ${CONFIG_FILE}
|
||||
sed -i 's#TLS_CERTIFICATE_FILE#'${TLS_CERTIFICATE_FILE}'#' ${CONFIG_FILE}
|
||||
sed -i 's#TLS_CERTIFICATE_KEY#'${TLS_CERTIFICATE_KEY}'#' ${CONFIG_FILE}
|
||||
sed -i 's#CONTACT_EMAIL#'${CONTACT_EMAIL}'#' ${CONFIG_FILE}
|
||||
|
||||
if [ "_${ENABLE_PHPMYADMIN}_" = "_yes_" ]; then
|
||||
echo "Enabling local PHPMyAdmin on https://${SERVER_NAME}/phpmyadmin"
|
||||
cp /etc/apache2/conf-available/phpmyadmin.conf /etc/apache2/conf-enabled/phpmyadmin.conf
|
||||
a2enmod proxy
|
||||
a2enmod proxy_http
|
||||
fi
|
||||
|
||||
echo "Waiting for database ${DB_MYSQL_HOST} to be up and running"
|
||||
php /usr/local/bin/wait-for-db.php
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Stopping container"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f /var/www/html/AVideo/videos/configuration.php ]; then
|
||||
echo "Using existing configuration..."
|
||||
else
|
||||
echo "Create new configuration..."
|
||||
cd /var/www/html/AVideo/install/
|
||||
php ./cli.php
|
||||
cd /var/www/html/AVideo/
|
||||
fi
|
||||
|
||||
apache2-foreground
|
||||
#!/bin/bash
|
||||
|
||||
echo "Starting AVideo Platform..."
|
||||
CONFIG_FILE=/etc/apache2/sites-enabled/000-default.conf
|
||||
|
||||
if [ "_${CREATE_TLS_CERTIFICATE}_" == "_yes_" ]; then
|
||||
echo "Generate Certificate..."
|
||||
echo "Certificate file: ${TLS_CERTIFICATE_FILE}"
|
||||
echo "Certificate key: ${TLS_CERTIFICATE_KEY}"
|
||||
|
||||
mkdir -p `dirname ${TLS_CERTIFICATE_FILE}`
|
||||
mkdir -p `dirname ${TLS_CERTIFICATE_KEY}`
|
||||
subjectAltName="IP:127.0.0.1,DNS:${SERVER_NAME}"
|
||||
|
||||
CONFIG=""
|
||||
CONFIG="${CONFIG}[dn]\n"
|
||||
CONFIG="${CONFIG}C=NN\n"
|
||||
CONFIG="${CONFIG}L=Earth\n"
|
||||
CONFIG="${CONFIG}O=AVideo\n"
|
||||
CONFIG="${CONFIG}OU=Development\n"
|
||||
CONFIG="${CONFIG}CN=localhost\n"
|
||||
CONFIG="${CONFIG}\n"
|
||||
CONFIG="${CONFIG}[req]\n"
|
||||
CONFIG="${CONFIG}distinguished_name=dn\n"
|
||||
CONFIG="${CONFIG}\n"
|
||||
CONFIG="${CONFIG}[EXT]\n"
|
||||
CONFIG="${CONFIG}subjectAltName=${subjectAltName}\n"
|
||||
CONFIG="${CONFIG}extendedKeyUsage=serverAuth\n"
|
||||
CONFIG="${CONFIG}\n"
|
||||
|
||||
openssl req -x509 \
|
||||
-out ${TLS_CERTIFICATE_FILE} -keyout ${TLS_CERTIFICATE_KEY} \
|
||||
-newkey rsa:4096 \
|
||||
-nodes \
|
||||
-sha256 \
|
||||
-days 3650 \
|
||||
-subj '/C=NN/L=Earth/O=avideo/OU=DEV/CN=localhost' \
|
||||
-extensions EXT -config <( \
|
||||
printf "${CONFIG}")
|
||||
|
||||
echo "New Certificate config..."
|
||||
openssl x509 -in ${TLS_CERTIFICATE_FILE} -noout -text || true
|
||||
fi
|
||||
|
||||
echo "Configure Apache..."
|
||||
sed -i 's#SERVER_NAME#'${SERVER_NAME}'#' ${CONFIG_FILE}
|
||||
sed -i 's#TLS_CERTIFICATE_FILE#'${TLS_CERTIFICATE_FILE}'#' ${CONFIG_FILE}
|
||||
sed -i 's#TLS_CERTIFICATE_KEY#'${TLS_CERTIFICATE_KEY}'#' ${CONFIG_FILE}
|
||||
sed -i 's#CONTACT_EMAIL#'${CONTACT_EMAIL}'#' ${CONFIG_FILE}
|
||||
|
||||
if [ "_${ENABLE_PHPMYADMIN}_" = "_yes_" ]; then
|
||||
echo "Enabling local PHPMyAdmin on https://${SERVER_NAME}/phpmyadmin"
|
||||
cp /etc/apache2/conf-available/phpmyadmin.conf /etc/apache2/conf-enabled/phpmyadmin.conf
|
||||
a2enmod proxy
|
||||
a2enmod proxy_http
|
||||
fi
|
||||
|
||||
echo "Waiting for database ${DB_MYSQL_HOST} to be up and running"
|
||||
php /usr/local/bin/wait-for-db.php
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Stopping container"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f /var/www/html/AVideo/videos/configuration.php ]; then
|
||||
echo "Using existing configuration..."
|
||||
else
|
||||
echo "Create new configuration..."
|
||||
cd /var/www/html/AVideo/install/
|
||||
php ./cli.php
|
||||
cd /var/www/html/AVideo/
|
||||
fi
|
||||
|
||||
apache2-foreground
|
||||
#eof
|
||||
|
|
@ -50,7 +50,7 @@ services:
|
|||
image: "mariadb:latest"
|
||||
restart: "unless-stopped"
|
||||
environment:
|
||||
MYSQL_RANDOM_ROOT_PASSWORD: yes
|
||||
MYSQL_RANDOM_ROOT_PASSWORD: "yes"
|
||||
MYSQL_INITDB_SKIP_TZINFO: 1
|
||||
MYSQL_DATABASE: "avideo"
|
||||
MYSQL_USER: "avideo"
|
||||
|
|
|
|||
28
package-lock.json
generated
28
package-lock.json
generated
|
|
@ -8,7 +8,7 @@
|
|||
"@silvermine/videojs-chromecast": "^1.3.3",
|
||||
"animate.css": "^4.1.1",
|
||||
"chart.js": "^3.8.0",
|
||||
"codemirror": "^6.0.0",
|
||||
"codemirror": "^6.0.1",
|
||||
"croppie": "^2.6.5",
|
||||
"dom-walk": "^0.1.2",
|
||||
"fontawesome-free": "^1.0.4",
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
"keycode": "^2.2.1",
|
||||
"moment-timezone": "^0.5.34",
|
||||
"sweetalert": "^2.1.2",
|
||||
"tinymce": "^6.0.3",
|
||||
"tinymce": "^6.1.0",
|
||||
"tinymce-langs": "^1.0.0",
|
||||
"video.js": "^7.19.2",
|
||||
"videojs-contrib-ads": "^6.9.0",
|
||||
|
|
@ -252,9 +252,9 @@
|
|||
"integrity": "sha512-Tzj+2kAkZs+iGiUOUoKvtj4c/SjeVdKZXg/NbLTGKu0kp66h69dyMHQwOSzuyIghXAUswuY24TZc0HdaJCXx2A=="
|
||||
},
|
||||
"node_modules/codemirror": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.0.tgz",
|
||||
"integrity": "sha512-c4XR9QtDn+NhKLM2FBsnRn9SFdRH7G6594DYC/fyKKIsTOcdLF0WNWRd+f6kNyd5j1vgYPucbIeq2XkywYCwhA==",
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
|
||||
"integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
|
||||
"dependencies": {
|
||||
"@codemirror/autocomplete": "^6.0.0",
|
||||
"@codemirror/commands": "^6.0.0",
|
||||
|
|
@ -486,9 +486,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/tinymce": {
|
||||
"version": "6.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.0.3.tgz",
|
||||
"integrity": "sha512-4cu80kWF7nRGhviE10poZtjTkl3jNL+lycilCMfdm3KU5V7FtiQQrKbEo6GInXT05RY78Ha/NFP0gOBELcSpfg=="
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.1.0.tgz",
|
||||
"integrity": "sha512-IdSdMlmuyhpEpUuabhBUaRC2NzZZxP2/CO/F+/54kTaAifB1Et5mKEty03pJYZxl6GBdFgclKRA2UU5JKJtJbA=="
|
||||
},
|
||||
"node_modules/tinymce-langs": {
|
||||
"version": "1.0.0",
|
||||
|
|
@ -782,9 +782,9 @@
|
|||
"integrity": "sha512-Tzj+2kAkZs+iGiUOUoKvtj4c/SjeVdKZXg/NbLTGKu0kp66h69dyMHQwOSzuyIghXAUswuY24TZc0HdaJCXx2A=="
|
||||
},
|
||||
"codemirror": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.0.tgz",
|
||||
"integrity": "sha512-c4XR9QtDn+NhKLM2FBsnRn9SFdRH7G6594DYC/fyKKIsTOcdLF0WNWRd+f6kNyd5j1vgYPucbIeq2XkywYCwhA==",
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
|
||||
"integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
|
||||
"requires": {
|
||||
"@codemirror/autocomplete": "^6.0.0",
|
||||
"@codemirror/commands": "^6.0.0",
|
||||
|
|
@ -994,9 +994,9 @@
|
|||
}
|
||||
},
|
||||
"tinymce": {
|
||||
"version": "6.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.0.3.tgz",
|
||||
"integrity": "sha512-4cu80kWF7nRGhviE10poZtjTkl3jNL+lycilCMfdm3KU5V7FtiQQrKbEo6GInXT05RY78Ha/NFP0gOBELcSpfg=="
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.1.0.tgz",
|
||||
"integrity": "sha512-IdSdMlmuyhpEpUuabhBUaRC2NzZZxP2/CO/F+/54kTaAifB1Et5mKEty03pJYZxl6GBdFgclKRA2UU5JKJtJbA=="
|
||||
},
|
||||
"tinymce-langs": {
|
||||
"version": "1.0.0",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"@silvermine/videojs-chromecast": "^1.3.3",
|
||||
"animate.css": "^4.1.1",
|
||||
"chart.js": "^3.8.0",
|
||||
"codemirror": "^6.0.0",
|
||||
"codemirror": "^6.0.1",
|
||||
"croppie": "^2.6.5",
|
||||
"dom-walk": "^0.1.2",
|
||||
"fontawesome-free": "^1.0.4",
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
"keycode": "^2.2.1",
|
||||
"moment-timezone": "^0.5.34",
|
||||
"sweetalert": "^2.1.2",
|
||||
"tinymce": "^6.0.3",
|
||||
"tinymce": "^6.1.0",
|
||||
"tinymce-langs": "^1.0.0",
|
||||
"video.js": "^7.19.2",
|
||||
"videojs-contrib-ads": "^6.9.0",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue