Dropped charset-related data from packages and default configuration.
diff --git a/alpine/APKBUILD-base.in b/alpine/APKBUILD-base.in index af2d171..c28a3b3 100644 --- a/alpine/APKBUILD-base.in +++ b/alpine/APKBUILD-base.in
@@ -98,4 +98,7 @@ ln -sf /$_modules_dir ./etc/nginx/modules rm -rf ./etc/nginx/*.default + rm -f ./etc/nginx/koi-utf + rm -f ./etc/nginx/koi-win + rm -f ./etc/nginx/win-utf }
diff --git a/alpine/nginx.default.conf b/alpine/nginx.default.conf index 299c622..ff2ced6 100644 --- a/alpine/nginx.default.conf +++ b/alpine/nginx.default.conf
@@ -2,7 +2,6 @@ listen 80; server_name localhost; - #charset koi8-r; #access_log /var/log/nginx/host.access.log main; location / {
diff --git a/debian/nginx.default.conf b/debian/nginx.default.conf index 299c622..ff2ced6 100644 --- a/debian/nginx.default.conf +++ b/debian/nginx.default.conf
@@ -2,7 +2,6 @@ listen 80; server_name localhost; - #charset koi8-r; #access_log /var/log/nginx/host.access.log main; location / {
diff --git a/debian/nginx.install b/debian/nginx.install index 0865ff1..1df3cd4 100644 --- a/debian/nginx.install +++ b/debian/nginx.install
@@ -1,7 +1,4 @@ debian/nginx.conf etc/nginx -conf/win-utf etc/nginx -conf/koi-utf etc/nginx -conf/koi-win etc/nginx conf/mime.types etc/nginx conf/scgi_params etc/nginx conf/fastcgi_params etc/nginx
diff --git a/rpm/SOURCES/nginx.default.conf b/rpm/SOURCES/nginx.default.conf index 299c622..ff2ced6 100644 --- a/rpm/SOURCES/nginx.default.conf +++ b/rpm/SOURCES/nginx.default.conf
@@ -2,7 +2,6 @@ listen 80; server_name localhost; - #charset koi8-r; #access_log /var/log/nginx/host.access.log main; location / {
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in index 22a5027..39d81f7 100644 --- a/rpm/SPECS/nginx.spec.in +++ b/rpm/SPECS/nginx.spec.in
@@ -168,6 +168,10 @@ %{__install} -m755 %{bdir}/objs/nginx-debug \ $RPM_BUILD_ROOT%{_sbindir}/nginx-debug +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/koi-utf +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/koi-win +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/win-utf + %check %{__rm} -rf $RPM_BUILD_ROOT/usr/src cd %{bdir} @@ -196,9 +200,6 @@ %config(noreplace) %{_sysconfdir}/nginx/fastcgi_params %config(noreplace) %{_sysconfdir}/nginx/scgi_params %config(noreplace) %{_sysconfdir}/nginx/uwsgi_params -%config(noreplace) %{_sysconfdir}/nginx/koi-utf -%config(noreplace) %{_sysconfdir}/nginx/koi-win -%config(noreplace) %{_sysconfdir}/nginx/win-utf %config(noreplace) %{_sysconfdir}/logrotate.d/nginx %{_unitdir}/nginx.service