[packages/nginx] rename flavor to type. simplier to type it

[glen]

commit a8a40c5a689711eca7b61ae20c615717636ebd64
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 3 23:49:18 2015 +0300

    rename flavor to type. simplier to type it

 nginx.conf |  8 ++++----
 nginx.init | 12 ++++++------
 nginx.spec | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index b289a41..e256b51 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -408,20 +408,20 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/proxy.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-standard.conf
-%{__sed} -i -e 's/@flavor@/standard/g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-standard.conf
+%{__sed} -i -e 's/@type@/standard/g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-standard.conf
 cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/monit/%{name}-standard.monitrc
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard
-%{__sed} -i -e 's/@flavor@/standard/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard
+%{__sed} -i -e 's/@type@/standard/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard
 cp -p %{SOURCE18} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-standard.service
 install -p bin/nginx-standard $RPM_BUILD_ROOT%{_sbindir}
 ln -sf %{systemdunitdir}/%{name}-standard.service $RPM_BUILD_ROOT/etc/systemd/system/nginx.service
 
 %if %{with light}
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-light.conf
-%{__sed} -i -e 's/@flavor@/light/g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-light.conf
+%{__sed} -i -e 's/@type@/light/g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-light.conf
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/%{name}-light.monitrc
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-light
-%{__sed} -i -e 's/@flavor@/light/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-light
+%{__sed} -i -e 's/@type@/light/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-light
 cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-light.service
 install -p bin/nginx-light $RPM_BUILD_ROOT%{_sbindir}
 %endif
@@ -431,17 +431,17 @@ cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-mail.conf
 cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/monit/%{name}-mail.monitrc
 install -p bin/nginx-mail $RPM_BUILD_ROOT%{_sbindir}
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail
-%{__sed} -i -e 's/@flavor@/mail/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail
+%{__sed} -i -e 's/@type@/mail/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail
 cp -p %{SOURCE21} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-mail.service
 %endif
 
 %if %{with perl}
 install -d $RPM_BUILD_ROOT{%{perl_vendorarch},%{perl_vendorarch}/auto/%{name}}
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-perl.conf
-%{__sed} -i -e 's/@flavor@/perl/g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-perl.conf
+%{__sed} -i -e 's/@type@/perl/g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-perl.conf
 cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}-perl.monitrc
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl
-%{__sed} -i -e 's/@flavor@/perl/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl
+%{__sed} -i -e 's/@type@/perl/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl
 cp -p %{SOURCE20} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-perl.service
 cp -p bin/nginx.pm $RPM_BUILD_ROOT%{perl_vendorarch}/%{name}.pm
 install -p bin/nginx.so $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so
diff --git a/nginx.conf b/nginx.conf
index 1eb3ce2..5e908c8 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,6 +1,6 @@
 user			nginx nginx;
-error_log		/var/log/nginx/nginx- at flavor@_error.log;
-pid			/var/run/nginx- at flavor@.pid;
+error_log		/var/log/nginx/nginx- at type@_error.log;
+pid			/var/run/nginx- at type@.pid;
 
 events {
 	worker_connections	2048;
@@ -14,7 +14,7 @@ http {
 	log_format	main	'$remote_addr - $remote_user [$time_local] $request '
 				'"$status" $body_bytes_sent "$http_referer" '
 				'"$http_user_agent" "$http_x_forwarded_for"';
-	access_log	/var/log/nginx/nginx- at flavor@_access.log	main;
+	access_log	/var/log/nginx/nginx- at type@_access.log	main;
 
 	server {
 		listen		80;
@@ -36,7 +36,7 @@ http {
 		# ssl_certificate_key /etc/nginx/server.key;
 
 		server_name	localhost;
-		access_log	/var/log/nginx/nginx- at flavor@_access.log main;
+		access_log	/var/log/nginx/nginx- at type@_access.log main;
 
 		location / {
 			autoindex	on;
diff --git a/nginx.init b/nginx.init
index 99221e2..1000169 100755
--- a/nginx.init
+++ b/nginx.init
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# nginx	Nginx Web Server (@flavor@ version)
+# nginx	Nginx Web Server (@type@ version)
 #
 # chkconfig:	345 85 15
 # description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
 #               proxy and IMAP/POP3 proxy server
-# processname:	nginx- at flavor@
-# pidfile:	/var/run/nginx- at flavor@.pid
-# config:	/etc/nginx/nginx- at flavor@.conf
+# processname:	nginx- at type@
+# pidfile:	/var/run/nginx- at type@.pid
+# config:	/etc/nginx/nginx- at type@.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -15,8 +15,8 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
-nginx="/usr/sbin/nginx- at flavor@"
-svname="nginx (@flavor@)"
+nginx="/usr/sbin/nginx- at type@"
+svname="nginx (@type@)"
 prog=${nginx##*/}
 
 sysconfig="/etc/sysconfig/$prog"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/8532ffca3ce041d5b6779a4d026081cde666804b