diff --git a/encoder/static.php b/encoder/static.php index 153a985..62dcad6 100755 --- a/encoder/static.php +++ b/encoder/static.php @@ -685,7 +685,7 @@ function update_service($which_service) } break; case 'display'; - $display = "mpv --vo=drm --drm-mode=" . $display_resolution . " --fs --keepaspect=no --audio-device=alsa/plughw:" . $display_audio; + $display = "mpv --hwdec=auto --demuxer-lavf-o=fflags=+discardcorrupt --vo=drm --drm-mode=" . $display_resolution . " --fs --keepaspect=no --audio-device=alsa/plughw:" . $display_audio; if ($display_hdmi_sdi === "enable") { $display .= ' --audio-format=s16 --audio-samplerate=48000 --audio-channels=stereo --audio-spdif=no'; } else { diff --git a/install.sh b/install.sh index cdee240..6f3b8de 100755 --- a/install.sh +++ b/install.sh @@ -23,23 +23,31 @@ EOL cat > /etc/apache2/sites-available/default-ssl.conf << 'EOL' - + + ServerName localhost ServerAdmin webmaster@localhost - DocumentRoot /var/www/encoder + DocumentRoot /var/www/encoder - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - SSLEngine on + ErrorLog ${APACHE_LOG_DIR}/encoder-ssl-error.log + CustomLog ${APACHE_LOG_DIR}/encoder-ssl-access.log combined - SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem - SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key + SSLEngine on + SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem + SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - + + Options Indexes FollowSymLinks + AllowOverride All + Require all granted + + + + SSLOptions +StdEnvVars + + + + SSLOptions +StdEnvVars + EOL diff --git a/setup.sh b/setup.sh index d9d618d..11038e4 100644 --- a/setup.sh +++ b/setup.sh @@ -1,4 +1,7 @@ sudo cp -r encoder/* /var/www/encoder/ +sudo cp -r html/* /var/www/html/ sudo cp users.json /var/www/users.json sudo cp attempts.json /var/www/attempts.json +DEVICE_ID="$(sudo cat /sys/class/dmi/id/product_uuid | tr -d '\n')" +sudo sed -i 's/certificatecertificatecertificatecertificate/'$DEVICE_ID'/g' /var/www/html/certification.html sudo reboot \ No newline at end of file