rename flavor to type. simplier to type it

diff --git a/nginx.conf b/nginx.conf
index 1eb3ce25d1f97db5f06ab48d1872de8fe929197e..5e908c89a34b5519c43a4d73e2e6bcb2dda7835d 100644 (file)
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,6 +1,6 @@
 user                   nginx nginx;
-error_log              /var/log/nginx/nginx-@flavor@_error.log;
-pid                    /var/run/nginx-@flavor@.pid;
+error_log              /var/log/nginx/nginx-@type@_error.log;
+pid                    /var/run/nginx-@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-@flavor@_access.log        main;
+       access_log      /var/log/nginx/nginx-@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-@flavor@_access.log main;
+               access_log      /var/log/nginx/nginx-@type@_access.log main;
 
                location / {
                        autoindex       on;

diff --git a/nginx.init b/nginx.init
index 99221e2a19efdb94c5a93349f562034a0bf7d29c..1000169cb66ca1d352b0d521d8fa077af9125b1a 100755 (executable)
--- 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-@flavor@
-# pidfile:     /var/run/nginx-@flavor@.pid
-# config:      /etc/nginx/nginx-@flavor@.conf
+# processname: nginx-@type@
+# pidfile:     /var/run/nginx-@type@.pid
+# config:      /etc/nginx/nginx-@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-@flavor@"
-svname="nginx (@flavor@)"
+nginx="/usr/sbin/nginx-@type@"
+svname="nginx (@type@)"
 prog=${nginx##*/}
 
 sysconfig="/etc/sysconfig/$prog"

diff --git a/nginx.spec b/nginx.spec
index b289a411b2c93c9b51ab466829343566fef51602..e256b51edb0d1eecef85625748d2a89b70104fe7 100644 (file)
--- 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