Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Software | Simplify and consistent config file naming #2312

Merged
merged 27 commits into from
Dec 3, 2018
Merged
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#/etc/udev/rules.d/99-input.rules
# /etc/udev/rules.d/99-dietpi-kodi.rules
SUBSYSTEM=="input", GROUP="input", MODE="0660"
KERNEL=="tty[0-9]*", GROUP="tty", MODE="0660"
File renamed without changes.
File renamed without changes.
78 changes: 39 additions & 39 deletions .conf/dps_85/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ worker_processes 1;
worker_rlimit_nofile 100;

events {
worker_connections 50;
worker_connections 50;
}

error_log /var/log/nginx/error.log;
Expand All @@ -20,48 +20,48 @@ pid /run/nginx.pid;

http {

charset utf-8;
charset utf-8;

# + Nginx - To avoid 2MB upload error: https://github.com/Fourdee/DietPi/issues/546
client_max_body_size 2000M;

# Upstream to abstract back-end connection(s) for PHP
upstream php {
server unix:/run/php5-fpm.sock;
}
# Upstream to abstract back-end connection(s) for PHP
upstream php {
server unix:/run/php/php7.0-fpm.sock;
}

# Set the mime-types via the mime.types external file
include mime.types;
# Set the mime-types via the mime.types external file
include mime.types;

# And the fallback mime-type
default_type application/octet-stream;
# And the fallback mime-type
default_type application/octet-stream;

# Click tracking!
access_log off;
# Click tracking!
access_log off;

# Hide nginx version
server_tokens off;
# Hide nginx version
server_tokens off;

# ~2 seconds is often enough for HTML/CSS, but connections in
# Nginx are cheap, so generally it's safe to increase it
keepalive_timeout 2;
# ~2 seconds is often enough for HTML/CSS, but connections in
# Nginx are cheap, so generally it's safe to increase it
keepalive_timeout 2;

# You usually want to serve static files with Nginx
sendfile on;
# You usually want to serve static files with Nginx
sendfile on;

tcp_nopush on; # off may be better for Comet/long-poll stuff
tcp_nodelay off; # on may be better for Comet/long-poll stuff
tcp_nopush on; # off may be better for Comet/long-poll stuff
tcp_nodelay off; # on may be better for Comet/long-poll stuff

server_name_in_redirect off;
types_hash_max_size 2048;
server_name_in_redirect off;
types_hash_max_size 2048;

gzip off;
gzip_http_version 1.0;
gzip_comp_level 1;
gzip_min_length 512;
gzip_buffers 4 8k;
gzip_proxied any;
gzip_types
gzip off;
gzip_http_version 1.0;
gzip_comp_level 1;
gzip_min_length 512;
gzip_buffers 4 8k;
gzip_proxied any;
gzip_types
# text/html is always compressed by HttpGzipModule
text/css
text/plain
Expand All @@ -76,15 +76,15 @@ http {
image/svg+xml
image/x-icon;

# This should be turned on if you are going to have pre-compressed copies (.gz) of
# static files available. If not it should be left off as it will cause extra I/O
# for the check. It would be better to enable this in a location {} block for
# a specific directory:
# gzip_static on;
# This should be turned on if you are going to have pre-compressed copies (.gz) of
# static files available. If not it should be left off as it will cause extra I/O
# for the check. It would be better to enable this in a location {} block for
# a specific directory:
#gzip_static on;

gzip_disable "msie6";
gzip_vary on;
gzip_disable "msie6";
gzip_vary on;

include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
}
File renamed without changes.
File renamed without changes.