Author: glen Date: Mon Jan 3 13:42:04 2011 GMT Module: packages Tag: HEAD ---- Log message: - webui webapps integration
---- Files affected: packages/policyd: policyd.spec (1.15 -> 1.16) , apache.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/policyd/policyd.spec diff -u packages/policyd/policyd.spec:1.15 packages/policyd/policyd.spec:1.16 --- packages/policyd/policyd.spec:1.15 Mon Jan 3 14:36:19 2011 +++ packages/policyd/policyd.spec Mon Jan 3 14:41:59 2011 @@ -4,11 +4,12 @@ Summary(pl.UTF-8): Policyd - wtyczka antyspamowa dla Postfiksa Name: policyd Version: 2.0.10 -Release: 0.6 +Release: 0.7 License: GPL v2 Group: Networking Source0: http://downloads.sourceforge.net/policyd/cluebringer-%{version}.tar.bz2 # Source0-md5: cdff8f8e7c0e95143f7108159aed80c6 +Source1: apache.conf Source2: %{name}.sysconfig Source3: %{name}.conf Source4: %{name}.init @@ -32,6 +33,7 @@ %define _webapps /etc/webapps %define _webapp %{name} +%define _webappdir %{_datadir}/%{name}-webui %description Policyd v2 (codenamed "cluebringer") is a multi-platform policy server @@ -61,11 +63,15 @@ Policyd "ClueBringer" Perl Libraries. %package webui -Summary: Policyd "ClueBringer" Web UI +Summary: Policyd Web Administration Group: Applications/WWW +Requires: webapps +Requires: webserver(access) +Requires: webserver(alias) +Requires: webserver(php) %description webui -Policyd "ClueBringer" Web UI. +Policyd Web Administration. %prep %setup -q -n cluebringer-%{version} @@ -97,13 +103,13 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} # Webui -install -d $RPM_BUILD_ROOT{%{_webapps}/%{_webapp},%{_datadir}/%{name}/webui} -cp -R webui/* $RPM_BUILD_ROOT%{_datadir}/%{name}/webui -install contrib/httpd/cluebringer-httpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf +install -d $RPM_BUILD_ROOT{%{_webapps}/%{_webapp},%{_webappdir}} +cp -R webui/* $RPM_BUILD_ROOT%{_webappdir} +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf cp -a $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/{apache,httpd}.conf # Move config into %{_sysconfdir} -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/webui/includes/config.php $RPM_BUILD_ROOT%{_webapps}/%{_webapp} -ln -s %{_webapps}/%{_webapp}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/webui/includes +mv $RPM_BUILD_ROOT%{_webappdir}/includes/config.php $RPM_BUILD_ROOT%{_webapps}/%{_webapp} +ln -s %{_webapps}/%{_webapp}/config.php $RPM_BUILD_ROOT%{_webappdir}/includes %clean rm -rf $RPM_BUILD_ROOT @@ -169,8 +175,7 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/config.php -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/webui +%{_webappdir} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -178,6 +183,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2011/01/03 13:41:59 glen +- webui webapps integration + Revision 1.15 2011/01/03 13:36:19 glen - drop cleanup and cron ================================================================ Index: packages/policyd/apache.conf diff -u /dev/null packages/policyd/apache.conf:1.1 --- /dev/null Mon Jan 3 14:42:04 2011 +++ packages/policyd/apache.conf Mon Jan 3 14:41:59 2011 @@ -0,0 +1,6 @@ +Alias /cluebringer /usr/share/policyd-webui +<Directory /usr/share/policyd-webui> + Order Deny,Allow + Deny from all + Allow from 127.0.0.1 +</Directory> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/policyd/policyd.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
