1
0
mirror of https://github.com/gilbN/theme.park.git synced 2024-11-20 18:12:31 +01:00

Merge pull request #479 from GilbN/develop

1.13.5
This commit is contained in:
GilbN 2023-03-04 21:02:56 +01:00 committed by GitHub
commit 9a5f849c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 54 additions and 57 deletions

View File

@ -108,7 +108,8 @@
}
[class*="MovieFileEditorTable-container-"],
[class*="MovieHistoryTable-container-"] {
[class*="MovieHistoryTable-container-"],
[class*="MovieTitlesTable-container-"] {
border: 1px solid transparent;
background: var(--transparency-dark-25);
}

View File

@ -1,34 +1,32 @@
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name _;
ssl_certificate /config/keys/cert.crt;
ssl_certificate_key /config/keys/cert.key;
index index.html index.htm index.php;
location / {
alias /config/www/;
try_files $uri $uri/ =404;
}
location /themepark {return 302 $scheme://$http_host/themepark/;}
location /themepark/ {
alias /config/www/;
sub_filter_types *;
sub_filter 'url("/css/' 'url("/themepark/css/';
sub_filter 'url(/resources/' 'url(/themepark/resources/';
sub_filter_once off;
try_files $uri $uri/ =404;
}
# Don't cache
add_header Last-Modified $date_gmt;
add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
if_modified_since off;
expires -1;
etag off;
}
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name _;
index index.html index.htm index.php;
location / {
alias /config/www/;
try_files $uri $uri/ =404;
}
location /themepark {return 302 $scheme://$http_host/themepark/;}
location /themepark/ {
alias /config/www/;
sub_filter_types *;
sub_filter 'url("/css/' 'url("/themepark/css/';
sub_filter 'url(/resources/' 'url(/themepark/resources/';
sub_filter_once off;
try_files $uri $uri/ =404;
}
# Don't cache
add_header Last-Modified $date_gmt;
add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
if_modified_since off;
expires -1;
etag off;
}

View File

@ -0,0 +1,10 @@
████████╗██╗ ██╗███████╗███╗ ███╗███████╗ ██████╗ █████╗ ██████╗ ██╗ ██╗
╚══██╔══╝██║ ██║██╔════╝████╗ ████║██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██║ ██╔╝
██║ ███████║█████╗ ██╔████╔██║█████╗ ██████╔╝███████║██████╔╝█████╔╝
██║ ██╔══██║██╔══╝ ██║╚██╔╝██║██╔══╝ ██╔═══╝ ██╔══██║██╔══██╗██╔═██╗
██║ ██║ ██║███████╗██║ ╚═╝ ██║███████╗██╗██║ ██║ ██║██║ ██║██║ ██╗
╚═╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚══════╝╚═╝╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝
Made by @gilbN
https://theme-park.dev

View File

@ -0,0 +1 @@
oneshot

View File

@ -0,0 +1 @@
# This file doesn't do anything, it's just the end of the themepark init process

View File

@ -1,21 +1,5 @@
#!/usr/bin/with-contenv bash
echo '
----------------------------------------------------------------------------------------
dP dP dP
88 88 88
d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b. 88d888b. .d8888b. 88d888b. 88 .dP
88 88 `88 88ooood8 88 88 88 88ooood8 88. `88 88 `88 88 `88 88888.
88 88 88 88. ... 88 88 88 88. ... 88. .88 88 88 88 88 `8b.
dP dP dP `88888P dP dP dP `88888P 88 88Y888P `88888P8 dP dP `YP
88
dP
Made by @gilbN
https://theme-park.dev
----------------------------------------------------------------------------------------'
# Display variables for troubleshooting
echo -e "[theme.park-init] Variables set:\\n\
PUID=${PUID}\\n\
@ -31,13 +15,13 @@ case ${TP_URLBASE} in
;;
esac
DEFAULT='/defaults/default'
DEFAULT='/defaults/default.conf'
if [[ ${TP_URLBASE} ]]; then
if ! grep -q "${TP_URLBASE}" "${DEFAULT}"; then
sed -i "s/themepark/${TP_URLBASE}/g" ${DEFAULT}
fi
fi
cp /defaults/default /config/nginx/site-confs
cp /defaults/default.conf /config/nginx/site-confs
# make our folders and links
mkdir -p \
@ -60,7 +44,7 @@ echo '[theme.park-init] Copying mods into /config/docker-mods'
echo '[theme.park-init] Running themes.py and creating CSS files'
python3 /config/www/themes.py
echo '[theme.park-init] done.'
# permissions
chown -R abc:abc \
/config

View File

@ -0,0 +1 @@
oneshot

View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-themepark/run

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16
# set version label
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16
# set version label
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16
# set version label
ARG BUILD_DATE