From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yury Konovalov Organization: UnixCenter.RU To: ALT Devel discussion list Subject: Re: [devel] Re: /srv Date: Wed, 19 May 2004 17:50:03 +0400 User-Agent: KMail/1.6.2 References: <20040513112058.5D4721327@basalt.office.altlinux.org> <200405151911.34082.yurix@unixcenter.ru> <20040516165439.GC7880@osdn.org.ua> In-Reply-To: <20040516165439.GC7880@osdn.org.ua> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_LY2qA+6vKRRhiCU" Message-Id: <200405191750.20665.yurix@unixcenter.ru> X-BeenThere: devel@altlinux.ru X-Mailman-Version: 2.1.4 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2004 13:50:22 -0000 Archived-At: List-Archive: List-Post: --Boundary-00=_LY2qA+6vKRRhiCU Content-Type: Text/Plain; charset="koi8-r" Content-Transfer-Encoding: base64 Content-Disposition: inline LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQpIYXNoOiBTSEExCgr3z9PL0sXTxc7Y xSAxNiDtwcogMjAwNCAyMDo1NCwgTWljaGFlbCBTaGlnb3JpbiDOwdDJ08HMOgo+IE9uIFNhdCwg TWF5IDE1LCAyMDA0IGF0IDA3OjExOjEzUE0gKzA0MDAsIFl1cnkgS29ub3ZhbG92IHdyb3RlOgo+ ID4gMinkwdbFIM/T1MHXwdHT2CDXINLBzcvByCBmaHMtMi4yINDVzsvUMSDSxcHMydrVxc0g1M/M 2MvPCj4gPiDQxdLF08LP0svPyiBhcGFjaGUxIMkg0MXSxc3F3cXOycXNIMXHzyBkb2Nyb290INcK PiA+IC92YXIvd3d3L2FwYWNoMQo+Cj4g6NXWxSAtLSDU1cTBICjQz8QgL3Zhci93d3cpINXWxSDQ ydvF1CDUz8zQwSDQwcvF1M/XLgojIGdyZXAgIi92YXIvd3d3IiAuLi4uL2NvbnRlbnRzX2luZGV4 IHxhd2sgJ3twcmludCQyfSd8c29ydHx1bmlxCmFwYWNoZS1jb21tb24KYXBhY2hlLW1vZF9wZXJs CmF3c3RhdHMKYnVnemlsbGEKYnVnemlsbGEtcnUKY3Zzd2ViCmRhcmNzLXNlcnZlcgpob3JkZQpo dGRpZwppbXAKaXBhYy1uZwptYWlsZ3JhcGgKbWFpbG1hbgptaWRnYXJkLWRhdGEKbW5vZ29zZWFy Y2gtY2dpCm1vZF9mYXN0Y2dpCm1vZF9sb2dfc3FsCm1ydGcKbnV0LWNnaQpwYWNraG91c2UKcGhw LW1tY2FjaGUKcGhwTXlBZG1pbgpwaHBQZ0FkbWluCnNxdWlycmVsbWFpbAp3M2MtdmFsaWRhdG9y CndlYmFsaXplcgoK6dTPx88gIC0tICDNxc7FxSAyNC4KCuXTzMkg0MHLxdTZIMnT0M/M2NrVwNQg zcHL0s/T2SBhcGFjaGUtZGV2ZWwsINTPINcgy9LBys7FzSDTzNXewcUg3NTPINDSz9PUwdEgCtDF 0sXTws/Sy8EuCu7VIMkgx8zB187PxSAtLSDNzs/HycUgzsUg1NLFwtXF1NPRINDF0sXTz8LJ0sHU 2CDOxc3FxMzFzs7PLgoKPiA+IDEpIO/T1MHXwdHT2CDXINLBzcvByCBmaHMtMi4yINDF0sXOz9PJ zSBkb2Nyb290IGFwYWNoZTEg1wo+Cj4g5M/L0tXUIF/Ez8vVzcXO1MHDyclfIMnMySDB0MHewT8g IPDP1M/N1SDLwcsgxdPMySDX2dvFINvFzCDT0MneIM8KPiDSwdrExczRxc3PzSDLz87Uxc7UxSAt LSDUwcsg3NTPIMvByyDSwdogxM/L1c3FztTBw8nRIMkg0M/Ez8LOz8UKPiDNz9bF1CDF2sTJ1Ngs IMEgzsXQwcvF1M7ZyiDLz87Uxc7UIC0tIM7Bz8LP0s/ULCDMxdbB1Nggx8TFCj4g08vB2sHOzy4K 5MEuCvDSyd7FzSwgyc3Fzs7PINLB2sTFzNHFzdnKIMvPztTFztQg0NLFxM/T1MHXzNHA1CDCz8zY 28XO09TXzyDJ2iAK19nbxdDF0sXeydPMxc7O2cgg0MHLxdTP1y4KCvcgy8HexdPU18Ug18HSycHO 1MEg0M/EyM/EwSDLINLF28XOycAg3NTJyCDXz9DSz9PP1yDQ0sXEzMHHwcXU09E6CjEp88/axMHU 2CDQwcvF1CB2aG9zdHMtZmlsZXN5c3RlbSwgy8/Uz9LZyiDC1cTF1CDQ0sXEz9PUwdfM0dTYIArL wdTBzM/HySAvdmFyL3d3dyDJIC92YXIvd3d3L3Zob3N0cyDJINDBy8XUIHZob3N0cy1maWxlc3lz dGVtLWRldmVsLCDLz9TP0tnKIArC1cTF1CDQ0sXEz9PUwdfM0dTYIFJQTSDNwcvSz9PZICVzcnZf ZGlyKC92YXIvd3d3KSDJIAoldmhvc3RzX2RpcigvdmFyL3d3dy92aG9zdHMpIMTM0SDawcnO1MXS xdPP18HOztnIINDBy8XUz9cuCvDBy8XUINXWxSDTz9rEwc4gySDHz9TP1yDLIM/U0NLB18vJINcg aW5jb21pbmcuCjIp8MXSxdPPwtLB1NggYXBhY2hlMSDTINTFzSDe1M/C2SDVwtLB1Ngg0NLFxM/T 1MHXzMXOycUgL3Zhci93d3cgySAK0MXSxcvMwN7J1NjT0SDOwSDJ09DPzNjaz9fBzsnFIM3By9LP 08/XIHZob3N0cy1maWxlc3lzdGVtLWRldmVsLiBEb2NSb290IArNz9bOzyDQz8vBIM7FIMTXycfB 1NguCjMp+sHNxc7J1NggcmVnZXhwINcgL2V0Yy9zaXN5cGh1cy9maHMg0yBhcGFjaGUtY29tbW9u IM7BIHZob3N0cy1maWxlc3lzdGVtCjQp99nMz9bJ1NggYXBhY2hlMiwgy8/Uz9LZyiDUz9bFINXW xSDHz9TP1y4KCvDSyczBx8HAINDB1N4gyyDUxcvV3cXN1SBzcGVjJ9UgYXBhY2hlMSwgy8/Uz9LZ yiDOxSDNxc7RxdQg0sHT0M/Mz9bFzsnFIMbByszP1yAKYXBhY2hlMSwgzs8g1cLJ0sHF1CDQ0sXE z9PUwdfMxc7JxSAvdmFyL3d3dyDJIMTPwsHXzNHF1CDawdfJ08nNz9PU2CDOwSAKdmhvc3RzLWZp bGVzeXN0ZW0uCgrzIMfP1M/X2c3JIMsgz9TQ0sHXy8kg1yBpbmNvbWluZyDQwcvF1MHNySB2aG9z dHMtZmlsZXN5c3RlbSDJIGFwYWNoZTIgzc/Wzs8gCtDSySDWxczBzsnJIM/azsHLz83J1NjT0SDa xMXT2DogIApmdHA6Ly9mdHAudW5peGNlbnRlci5ydS9Vbml4Q2VudGVyL1dpZGVyL1NSUE1TCgrk zNEg1M/Hzywg3tTPwtkgz9TQ0sHXydTYIGFwYWNoZTIg1yBpbmNvbWluZyDO1dbOzyDTzsHewczB OgotIC0g0M/Nxc7R1NggcmVnZXhwIMTM0SBmaHMg0yBhcGFjaGUtY29tbW9uIM7BIHZob3N0cy1m aWxlc3lzdGVtICgg18/Q0s/TIMsgCuTJzcUsIMvByyDRINDPzsnNwcA/KQotIC0g0NLJzsPJ0MnB zNjOz8Ug08/HzMHTycUg0NLJztHU2CDJ2s3FzsXOydEg1yBhcGFjaGUxINDMwNMg08HNwSDQxdLF 08LP0svBCgr+1M8g08vB1sXUxT8KLS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lv bjogR251UEcgdjEuMi40IChHTlUvTGludXgpCgppRDhEQlFGQXEyWU1CTXB1cVAzdzdMZ1JBcEQ0 QUtDSXdQQzJDOStVVi9ybzFlYkhjUWVtTjZydm9RQ2dtYTZ5CmlwKytHYkk2Q2tpMjJmb3JEeXE3 aWxzPQo9S2pCRgotLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS0K --Boundary-00=_LY2qA+6vKRRhiCU Content-Type: text/x-diff; charset="koi8-r"; name="apache.spec.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="apache.spec.patch" --- apache-old.spec 2004-05-19 15:17:59 +0400 +++ apache.spec 2004-05-19 17:02:53 +0400 @@ -11,7 +11,7 @@ # EAPI tarball is subset of mod_ssl tarball %define apache_root %_sysconfdir/httpd -%define apache_home %_var/www +%define apache_home %srv_dir %define old_apache_home /home/httpd %define apache_user apache %define apache_group apache @@ -104,6 +104,7 @@ BuildRequires: libdb1-devel libgdbm-devel libmm-devel perl-BSD-Resource perl-CGI perl-Devel-Symdump perl-HTML-Parser perl-URI perl-devel perl-libwww-perl BuildRequires: altlinux-release +BuildRequires: vhosts-filesystem-devel # have to rip libdb4*-devel manually from buildreq'ed line %if_with Master @@ -235,6 +236,7 @@ Summary(uk_UA.KOI8-U): óЦÌØΦ ÆÁÊÌÉ ÄÌÑ ¦ÎÓÔÁÌÑæ§ apache ÔÁ apache-mod_perl Group: System/Servers PreReq: shadow-utils +PreReq: vhosts-filesystem %description common This package contains files required for both apache and apache-mod_perl @@ -671,7 +673,11 @@ %_sysconfdir/httpd/conf/apache-mime.types.default %_sysconfdir/httpd/conf/tables %apache_root/logs -%attr(-,root,%apache_webmaster) %dir %apache_home/ +# Uncomment the following line when apache_home will +# be different with %srv_dir e.g. when it will be +# something like %srv_dir/apache1 (/var/www/apache1), +# but not /var/www. +#%attr(-,root,%apache_webmaster) %dir %apache_home/ %attr(2775,root,%apache_webmaster) %dir %apache_home/html/ %attr(664,root,%apache_webmaster) %config(noreplace) %apache_home/html/*html* %attr(664,root,%apache_webmaster) %apache_home/html/*.gif --Boundary-00=_LY2qA+6vKRRhiCU--