Improve and install myproxy YAIM docs.

diff --git a/org.glite.px.myproxy-yaim/Makefile b/org.glite.px.myproxy-yaim/Makefile
index 63e9a41..d1c7376 100644 (file)
--- a/org.glite.px.myproxy-yaim/Makefile
+++ b/org.glite.px.myproxy-yaim/Makefile
@@ -25,7 +25,7 @@ SOURCES=\
        config/node-info.d/emi/glite-px* config/node-info.d/glite-px* \
        config/services/glite-px \
        Makefile
-FILES=glite-px.pre LICENSE COPYRIGHT node-version arch service update
+FILES=glite-px.pre LICENSE COPYRIGHT node-version arch service update myproxy-yaim.1.gz
 
 all ${FILES}:
        glite_var="${localstatedir}/glite"; \
@@ -41,6 +41,8 @@ all ${FILES}:
        echo ${platformArch} > arch
        echo "NA" > service
        echo "NA" > update
+       cp ${top_srcdir}/config/man/myproxy-yaim.1 .
+       gzip -9 -f  myproxy-yaim.1
 
 install: ${FILES}
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions/
@@ -48,6 +50,7 @@ install: ${FILES}
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/examples/siteinfo/services
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults
+       mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/man/man1
        install -m 0644 $(top_srcdir)/config/services/glite-px ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/examples/siteinfo/services/glite-px
        for c in gip_px  proxy_server ; do \
                install -m 0644 $(top_srcdir)/config/functions/config_$$c ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions; \
@@ -58,6 +61,7 @@ install: ${FILES}
        echo "$(package) $(version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package)
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-PX
        cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-PX/
+       install -m 0644 myproxy-yaim.1.gz ${DESTDIR}${PREFIX}${yaim_prefix}/man/man1/
 
 stage:
        $(MAKE) install PREFIX=${stagedir}

diff --git a/org.glite.px.myproxy-yaim/config/man/myproxy-yaim.1 b/org.glite.px.myproxy-yaim/config/man/myproxy-yaim.1
index 6d9165b..3187798 100644 (file)
--- a/org.glite.px.myproxy-yaim/config/man/myproxy-yaim.1
+++ b/org.glite.px.myproxy-yaim/config/man/myproxy-yaim.1
@@ -50,13 +50,29 @@ MYPROXY_DISABLE_USAGE_STATS : Disable Usage Metrics reporting. The myproxy serve
 .TP
 
 .SH EXAMPLES
-How to configure the Myproxy node.
 .TP
-.B ./yaim -c -s /root/site-info.def -n glite-PX
+How to configure the Myproxy node.
+
+.nf
+cat << EOF > /root/site-info.def
+SITE_NAME=emitb
+PX_HOST=`hostname -f`
+GRID_AUTHORIZED_RETRIEVERS="\\*" 
+GRID_AUTHORIZED_RENEWERS="
+  '/DC=org/DC=terena/DC=tcs/C=CZ/O=Masaryk University/CN=emitb2.ics.muni.cz'
+  '/DC=ch/DC=cern/OU=computers/CN=cvitbrcnagios.cern.ch'
+  '/DC=ch/DC=cern/OU=computers/CN=lxbra2302.cern.ch'
+"
+GRID_TRUSTED_RETRIEVERS="
+  '/DC=ch/DC=cern/OU=computers/CN=cvitbrcnagios.cern.ch'
+"
+EOF
+.B /opt/glite/yaim/bin/yaim -c -s /root/site-info.def -n glite-PX
+.fi
 .TP
 To debug the configuration process:
-.TP
-.B ./yaim -c -s /root/site-info.def -n glite-PX -d 6 
+
+.B /opt/glite/yaim/bin/yaim -c -s /root/site-info.def -n glite-PX -d 6 
 
 .SH DOCUMENTATION
 You can find useful information on these web pages:

diff --git a/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.dirs b/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.dirs
index d970fab..d76f563 100644 (file)
--- a/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.dirs
+++ b/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.dirs
@@ -1,4 +1,6 @@
 opt/glite
+opt/glite/man
+opt/glite/man/man1
 opt/glite/release
 opt/glite/release/glite-PX
 opt/glite/yaim

diff --git a/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.install b/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.install
index 9342e3f..bb49005 100644 (file)
--- a/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.install
+++ b/org.glite.px.myproxy-yaim/project/debian.glite-px-myproxy-yaim.install
@@ -1,3 +1,4 @@
+opt/glite/man/man1/*
 opt/glite/release/glite-PX/*
 opt/glite/yaim/defaults/*
 opt/glite/yaim/etc/versions/*

diff --git a/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec b/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec
index a3d1f3f..74bca7d 100644 (file)
--- a/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec
+++ b/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec
@@ -45,6 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %dir /opt/glite/
+%dir /opt/glite/man/
+%dir /opt/glite/man/man1/
 %dir /opt/glite/release/
 %dir /opt/glite/release/glite-PX/
 %dir /opt/glite/yaim/
@@ -54,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /opt/glite/yaim/examples/siteinfo/services/
 %dir /opt/glite/yaim/functions/
 %dir /opt/glite/yaim/node-info.d/
+/opt/glite/man/man1/*
 /opt/glite/release/glite-PX/COPYRIGHT
 /opt/glite/release/glite-PX/LICENSE
 /opt/glite/release/glite-PX/arch