- /home/httpd -> /home/services/httpd

Changed files:
    boa-PLD.patch -> 1.20
    boa.spec -> 1.54

diff --git a/boa-PLD.patch b/boa-PLD.patch
index 4f56fb9c9c4631e5b3b4afb5dfb6836da6b6e30f..3a11af9727a018a7cc2e95d4cdb113eb0e3d4372 100644 (file)
--- a/boa-PLD.patch
+++ b/boa-PLD.patch
@@ -68,7 +68,7 @@
  # Comment out to disable server non user files.
  
 -DocumentRoot /var/www
-+DocumentRoot /home/httpd/html
++DocumentRoot /home/services/httpd/html
  
  # UserDir: The name of the directory which is appended onto a user's home
  # directory if a ~user request is recieved.
@@ -86,5 +86,5 @@
  # Example: ScriptAlias /htbin/ /www/htbin/
  
 -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-+ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
++ScriptAlias /cgi-bin/ /home/services/httpd/cgi-bin/
  

diff --git a/boa.spec b/boa.spec
index 67f590f73361969e7befb00bbbef8cb130a226e4..18db02208618711b4ab9ba1d21c8b62fd623a3bd 100644 (file)
--- a/boa.spec
+++ b/boa.spec
@@ -66,14 +66,14 @@ cd ../docs
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/ \
        $RPM_BUILD_ROOT/var/log/httpd \
-       $RPM_BUILD_ROOT/home/httpd/{cgi-bin,html} \
+       $RPM_BUILD_ROOT/home/services/httpd/{cgi-bin,html} \
        $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/conf,%{_mandir}/man8} \
        $RPM_BUILD_ROOT/etc/logrotate.d
 
 install src/{boa,boa_indexer} $RPM_BUILD_ROOT%{_sbindir}/
 
-install src/*.pl $RPM_BUILD_ROOT/home/httpd/cgi-bin/
-install examples/* $RPM_BUILD_ROOT/home/httpd/cgi-bin/
+install src/*.pl $RPM_BUILD_ROOT/home/services/httpd/cgi-bin/
+install examples/* $RPM_BUILD_ROOT/home/services/httpd/cgi-bin/
 install        %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 install boa.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
@@ -103,7 +103,7 @@ if [ -n "`id -u http 2>/dev/null`" ]; then
         fi
 else
        echo "Creating user http UID=51"
-        /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
+        /usr/sbin/useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
 fi
 
 %postun
@@ -136,8 +136,8 @@ fi
 %attr(750, root,root) %dir %{_sysconfdir}
 %attr(640, root,root) %config(noreplace) %{_sysconfdir}/*
 %attr(640, root,root) %config(noreplace) /etc/logrotate.d/%{name}
-%attr(755, root,root) /home/httpd/html
-%attr(755, root,root) /home/httpd/cgi-bin
+%attr(755, root,root) /home/services/httpd/html
+%attr(755, root,root) /home/services/httpd/cgi-bin
 %attr(750, root,root) %dir /var/log/httpd/
 %attr(640, root,root) %ghost /var/log/httpd/*
 %attr(755, root,root) %{_sbindir}/*