Compare commits

..

No commits in common. "b97b5665d6073dc689ebaa991c944a06aa517efd" and "875b475295db7e39fd97d8270aef6f1c9ce77eb4" have entirely different histories.

5 changed files with 0 additions and 30 deletions

View File

@ -3,7 +3,6 @@
WEBROOT=/data/www WEBROOT=/data/www
WEBDAV_PORT=${WEBDAV_PORT:-8080} WEBDAV_PORT=${WEBDAV_PORT:-8080}
PHP=${PHP:-none} PHP=${PHP:-none}
POSTSIZE=${POSTSIZE:-256M}
USERNAME=${USERNAME:-theuser} USERNAME=${USERNAME:-theuser}
PUID=${PUID:-1000} PUID=${PUID:-1000}
GROUPNAME=${GROUPNAME:-thegroup} GROUPNAME=${GROUPNAME:-thegroup}
@ -37,21 +36,11 @@ pm.max_children = ${FPM_MAX_CHILDREN}
pm.start_servers = ${FPM_START_SERVERS} pm.start_servers = ${FPM_START_SERVERS}
pm.min_spare_servers = ${FPM_MIN_SPARE_SERVERS} pm.min_spare_servers = ${FPM_MIN_SPARE_SERVERS}
pm.max_spare_servers = ${FPM_MAX_SPARE_SERVERS} pm.max_spare_servers = ${FPM_MAX_SPARE_SERVERS}
EOF
cat >"/etc/${PHP}/conf.d/post_size.ini" <<EOF
upload_max_size = ${POSTSIZE}
post_max_size = ${POSTSIZE}
upload_max_filesize = ${POSTSIZE}
upload_tmp_dir = /tmp
EOF EOF
;; ;;
*) ;; *) ;;
esac esac
cat >"/etc/nginx/custom.d/post_size.conf" <<EOF
client_max_body_size ${POSTSIZE};
EOF
# start php # start php
case "${PHP}" in case "${PHP}" in
"php7") "php7")
@ -86,9 +75,6 @@ cat > /etc/nginx/conf.d/user.conf <<EOF
user ${USERNAME} ${GROUPNAME}; user ${USERNAME} ${GROUPNAME};
EOF EOF
# fix permissions for upload
chown "${USERNAME}" /var/lib/nginx
cat > /etc/nginx/http.d/webdav.conf <<EOF cat > /etc/nginx/http.d/webdav.conf <<EOF
server { server {
listen ${WEBDAV_PORT} default_server; listen ${WEBDAV_PORT} default_server;

View File

@ -3,7 +3,6 @@
WEBROOT=/data/www WEBROOT=/data/www
WEBDAV_PORT=${WEBDAV_PORT:-8080} WEBDAV_PORT=${WEBDAV_PORT:-8080}
PHP=${PHP:-none} PHP=${PHP:-none}
POSTSIZE=${POSTSIZE:-256M}
USERNAME=${USERNAME:-theuser} USERNAME=${USERNAME:-theuser}
PUID=${PUID:-1000} PUID=${PUID:-1000}
GROUPNAME=${GROUPNAME:-thegroup} GROUPNAME=${GROUPNAME:-thegroup}
@ -37,21 +36,11 @@ pm.max_children = ${FPM_MAX_CHILDREN}
pm.start_servers = ${FPM_START_SERVERS} pm.start_servers = ${FPM_START_SERVERS}
pm.min_spare_servers = ${FPM_MIN_SPARE_SERVERS} pm.min_spare_servers = ${FPM_MIN_SPARE_SERVERS}
pm.max_spare_servers = ${FPM_MAX_SPARE_SERVERS} pm.max_spare_servers = ${FPM_MAX_SPARE_SERVERS}
EOF
cat >"/etc/${PHP}/conf.d/post_size.ini" <<EOF
upload_max_size = ${POSTSIZE}
post_max_size = ${POSTSIZE}
upload_max_filesize = ${POSTSIZE}
upload_tmp_dir = /tmp
EOF EOF
;; ;;
*) ;; *) ;;
esac esac
cat >"/etc/nginx/custom.d/post_size.conf" <<EOF
client_max_body_size ${POSTSIZE};
EOF
# start php # start php
case "${PHP}" in case "${PHP}" in
"php84") "php84")
@ -96,9 +85,6 @@ cat > /etc/nginx/conf.d/user.conf <<EOF
user ${USERNAME} ${GROUPNAME}; user ${USERNAME} ${GROUPNAME};
EOF EOF
# fix permissions for upload
chown "${USERNAME}" /var/lib/nginx
cat > /etc/nginx/http.d/webdav.conf <<EOF cat > /etc/nginx/http.d/webdav.conf <<EOF
server { server {
listen ${WEBDAV_PORT} default_server; listen ${WEBDAV_PORT} default_server;

View File

@ -29,6 +29,5 @@ server {
add_header Pragma "public"; add_header Pragma "public";
add_header Cache-Control "max-age=31536000, public"; add_header Cache-Control "max-age=31536000, public";
include /etc/nginx/local.d/*.conf;
include /etc/nginx/custom.d/*.conf; include /etc/nginx/custom.d/*.conf;
} }

View File

@ -29,6 +29,5 @@ server {
add_header Pragma "public"; add_header Pragma "public";
add_header Cache-Control "max-age=31536000, public"; add_header Cache-Control "max-age=31536000, public";
include /etc/nginx/local.d/*.conf;
include /etc/nginx/custom.d/*.conf; include /etc/nginx/custom.d/*.conf;
} }