[Fedora-directory-commits] dsgw Makefile.am, 1.1.1.1, 1.2 Makefile.in, 1.1.1.1, 1.2 README, 1.1.1.1, 1.2 configure, 1.1.1.1, 1.2 configure.ac, 1.1.1.1, 1.2 dsgw-httpd.conf.in, 1.1.1.1, 1.2 setup.in, 1.1.1.1, 1.2
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Jun 2 22:57:20 UTC 2006
- Previous message (by thread): [Fedora-directory-commits] adminserver/admserv/console/src/com/netscape/management/admserv/task AdminTaskObject.java, 1.3, NONE CertSetup.java, 1.3, NONE Logging.java, 1.3, NONE Restart.java, 1.3, NONE SNMPSetup.java, 1.3, NONE ServerSetup.java, 1.3, NONE Stop.java, 1.3, NONE
- Next message (by thread): [Fedora-directory-commits] dsgw/m4 httpd.m4,1.1.1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22509
Modified Files:
Makefile.am Makefile.in README configure configure.ac
dsgw-httpd.conf.in setup.in
Log Message:
cleaned up build and setup scripts
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.am 1 Jun 2006 19:43:39 -0000 1.1.1.1
+++ Makefile.am 2 Jun 2006 22:57:17 -0000 1.2
@@ -146,12 +146,13 @@
pbconfig/display-room.html \
pbconfig/dsgwfilter.conf pbconfig/pb.tmpl
-nodist_context_DATA = setup
+nodist_context_DATA = dsgw-httpd.conf
+nodist_context_SCRIPTS = setup
# add more here for localized bundles
nodist_property_DATA = dsgw_root.res
-MOSTLYCLEANFILES = dsgw.conf dsgw_root.res dsgw.properties
+MOSTLYCLEANFILES = dsgw.conf dsgw_root.res dsgw.properties setup dsgw-httpd.conf
# Resource Bundle Compiler
if WINNT
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.in 1 Jun 2006 19:43:47 -0000 1.1.1.1
+++ Makefile.in 2 Jun 2006 22:57:17 -0000 1.2
@@ -35,6 +35,7 @@
# END COPYRIGHT BLOCK
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -64,9 +65,9 @@
DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \
$(dist_html_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config-h.in $(srcdir)/setup.in \
- $(top_srcdir)/configure AUTHORS ChangeLog NEWS depcomp \
- install-sh missing
+ $(srcdir)/config-h.in $(srcdir)/dsgw-httpd.conf.in \
+ $(srcdir)/setup.in $(top_srcdir)/configure AUTHORS ChangeLog \
+ NEWS depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/httpd.m4 \
$(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \
@@ -78,13 +79,13 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = setup
+CONFIG_CLEAN_FILES = setup dsgw-httpd.conf
am__EXEEXT_1 = unauth$(EXEEXT) search$(EXEEXT) csearch$(EXEEXT) \
newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" \
- "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" \
- "$(DESTDIR)$(propertydir)"
+am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(contextdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" \
+ "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" \
+ "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"
cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(cgibin_PROGRAMS) $(noinst_PROGRAMS)
am__auth_SOURCES_DIST = auth.c htmlout.c htmlparse.c error.c cgiutil.c \
@@ -185,6 +186,8 @@
secglue.$(OBJEXT)
unauth_OBJECTS = $(am_unauth_OBJECTS)
unauth_LDADD = $(LDADD)
+nodist_contextSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(nodist_context_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -297,6 +300,7 @@
bindir = @bindir@
build_alias = @build_alias@
cgibindir = @cgibindir@
+cgiuri = @cgiuri@
# config is a bit of a misnomer - these are really configurable templates
configdir = @configdir@
# the context dir is where the application specific config files go
@@ -306,6 +310,7 @@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
+httpdconf = @httpdconf@
icu_bin = @icu_bin@
icu_inc = @icu_inc@
icu_lib = @icu_lib@
@@ -435,11 +440,12 @@
pbconfig/display-room.html \
pbconfig/dsgwfilter.conf pbconfig/pb.tmpl
-nodist_context_DATA = setup
+nodist_context_DATA = dsgw-httpd.conf
+nodist_context_SCRIPTS = setup
# add more here for localized bundles
nodist_property_DATA = dsgw_root.res
-MOSTLYCLEANFILES = dsgw.conf dsgw_root.res dsgw.properties
+MOSTLYCLEANFILES = dsgw.conf dsgw_root.res dsgw.properties setup dsgw-httpd.conf
@WINNT_FALSE at ICU_GENRB = sh genrb_wrapper.sh @icu_bin@ @icu_lib@
# Resource Bundle Compiler
@@ -512,6 +518,8 @@
-rm -f config.h stamp-h1
setup: $(top_builddir)/config.status $(srcdir)/setup.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+dsgw-httpd.conf: $(top_builddir)/config.status $(srcdir)/dsgw-httpd.conf.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
install-cgibinPROGRAMS: $(cgibin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)"
@@ -577,6 +585,25 @@
unauth$(EXEEXT): $(unauth_OBJECTS) $(unauth_DEPENDENCIES)
@rm -f unauth$(EXEEXT)
$(LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS)
+install-nodist_contextSCRIPTS: $(nodist_context_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(contextdir)" || $(mkdir_p) "$(DESTDIR)$(contextdir)"
+ @list='$(nodist_context_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(nodist_contextSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(contextdir)/$$f'"; \
+ $(nodist_contextSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(contextdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-nodist_contextSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_context_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(contextdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(contextdir)/$$f"; \
+ done
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -911,9 +938,9 @@
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) config.h
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -966,7 +993,7 @@
install-data-am: install-cgibinPROGRAMS install-dist_configDATA \
install-dist_htmlDATA install-dist_pbconfigDATA \
install-dist_pbhtmlDATA install-nodist_contextDATA \
- install-nodist_propertyDATA
+ install-nodist_contextSCRIPTS install-nodist_propertyDATA
install-exec-am:
@@ -998,7 +1025,8 @@
uninstall-am: uninstall-cgibinPROGRAMS uninstall-dist_configDATA \
uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \
uninstall-dist_pbhtmlDATA uninstall-info-am \
- uninstall-nodist_contextDATA uninstall-nodist_propertyDATA
+ uninstall-nodist_contextDATA uninstall-nodist_contextSCRIPTS \
+ uninstall-nodist_propertyDATA
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-cgibinPROGRAMS clean-generic clean-noinstPROGRAMS ctags \
@@ -1010,15 +1038,16 @@
install-data-am install-dist_configDATA install-dist_htmlDATA \
install-dist_pbconfigDATA install-dist_pbhtmlDATA install-exec \
install-exec-am install-info install-info-am install-man \
- install-nodist_contextDATA install-nodist_propertyDATA \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-cgibinPROGRAMS \
+ install-nodist_contextDATA install-nodist_contextSCRIPTS \
+ install-nodist_propertyDATA install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-cgibinPROGRAMS \
uninstall-dist_configDATA uninstall-dist_htmlDATA \
uninstall-dist_pbconfigDATA uninstall-dist_pbhtmlDATA \
uninstall-info-am uninstall-nodist_contextDATA \
- uninstall-nodist_propertyDATA
+ uninstall-nodist_contextSCRIPTS uninstall-nodist_propertyDATA
# By default create only the default root bundle (english).
Index: README
===================================================================
RCS file: /cvs/dirsec/dsgw/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- README 1 Jun 2006 19:43:40 -0000 1.1.1.1
+++ README 2 Jun 2006 22:57:17 -0000 1.2
@@ -3,18 +3,52 @@
* Building - standard autotools - Do not edit configure or Makefile or Makefile.in -
Instead, change Makefile.am or configure.ac, then run autoreconf -fvi - do not
attempt to run aclocal or automake or autoconf - only use autoreconf -fvi - this
- also applies to the files in m4/
+ also applies to the files in m4/, that is, if you modify them, you must run
+ autoreconf -fvi
+
+* configure - DSGW requires NSPR, NSS, Mozilla LDAP C SDK, ICU, and AdminUtil - these
+ can be specified to configure (e.g.--with-nspr=/path), or configure will attempt
+ to find these components on the OS using pkg-config or icu-config
+ You can also specify --with-admserv=/path/to/admserv to make a DSGW package that
+ is compatible with the Admin Server (e.g. installs in clients/dsgw).
* Build process
0. Properties are in dbtdsgw.h - this file is used to generate the resource bundles
- and is also used in the source code to refer to the resource key
+ and is also used in the source code to refer to the property by its key
1. build propmaker
2. use propmaker to parse dbtdsgw.h and generate dsgw.properties
3. use genrb_wrapper.sh to "compile" dsgw.properties into dsgw_root.res
4. build the executable CGI programs
5. For a make install, copy the files to their desired directories - if you just
want to see how the files with be laid out in the file system, use
- make DESTDIR=built/ install # create destination directory structure under built/
+ make DESTDIR=built install # create destination directory structure under built/
OR
- make DESTDIR=/tmp/dsgwbuild/ # create dest dir under /tmp/dsgwbuild/
+ make DESTDIR=/tmp/dsgwbuild # create dest dir under /tmp/dsgwbuild/
rpmbuild will typically do something like the latter
+
+* Setup
+1. The configure/make process creates a shell script called setup which is
+ installed in the configdir (e.g. clients/dsgw/context or /etc/dsgw). This
+ should be run after installation (e.g. after rpm -i) and must be supplied
+ with the LDAP server host, port, suffix (for user entries) and directory
+ manager DN. You can also use a .inf file (in setuputil format) in silent
+ mode, so that you could do an install of directory server like this:
+ setup -k
+ then use that install.inf to setup dsgw like so:
+ rpm -i dsgw-1.1-.....
+ cd /etc/dsgw
+ ./setup -s -f /opt/fedora-ds/setup/install.inf
+
+2. The old Admin Server had the DSGW (Directory Server Express and
+ Directory Server Gateway) hard coded in start-console.html - we now replace
+ this during setup - the file has this information commented out - during
+ setup, if we find that file, we uncomment out the relevant sections and
+ change the URL appropriately (e.g. replace @cgiuri@ with the real one)
+
+3. We need to add some information to the httpd.conf file - to enable cgi-bin
+ execution, provide access to our HTML pages, and to set the environment
+ variable pointing to the config directory - The config directory will
+ usually be set during build/packaging, but can be overridden by SetEnv -
+ The setup process will copy the file dsgw-httpd.conf into the Apache
+ config directory (e.g. /etc/httpd/conf) and change httpd.conf to Include
+ the file
Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure 1 Jun 2006 19:43:42 -0000 1.1.1.1
+++ configure 2 Jun 2006 22:57:17 -0000 1.2
@@ -311,7 +311,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS POW_LIB HTTPD PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nss_inc nss_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver icu_lib icu_inc icu_bin cgibindir propertydir htmldir pbhtmldir configdir pbconfigdir contextdir!
securitydir cookiedir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS POW_LIB HTTPD PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nss_inc nss_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver icu_lib icu_inc icu_bin cgibindir cgiuri propertydir htmldir pbhtmldir configdir pbconfigdir con!
textdir securitydir cookiedir httpdconf NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -6023,6 +6023,7 @@
manualuri="/manual"
cgiuri="/clients/dsgw/bin/"
cookiedir="$basedir/cookies"
+ httpdconf="$withval/admin-serv/config/admserv.conf"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -6087,27 +6088,27 @@
httpd_conf_rel=`$HTTPD -V | grep SERVER_CONFIG_FILE | cut -f2 -d=`
httpd_conf_rel=`eval echo $httpd_conf_rel`
- httpd_conf=${httpd_root}/${httpd_conf_rel}
+ httpdconf=${httpd_root}/${httpd_conf_rel}
- htmlbasedir=`grep \^DocumentRoot $httpd_conf|awk '{print $2}'`
+ htmlbasedir=`grep \^DocumentRoot $httpdconf|awk '{print $2}'`
htmlbasedir=`eval echo $htmlbasedir`
# these directories are html based
htmldir="$htmlbasedir/dsgw/html"
pbhtmldir="$htmlbasedir/dsgw/pbhtml"
configdir="$htmlbasedir/dsgw/config"
pbconfigdir="$htmlbasedir/dsgw/pbconfig"
- manualuri="/dirsvr/manual"
+ manualuri="/dsgw/manual"
# CGI program directory
- cgibindir=`grep '^ScriptAlias.*/cgi-bin/' $httpd_conf|awk '{print $3}'`
+ cgibindir=`grep '^ScriptAlias.*/cgi-bin/' $httpdconf|awk '{print $3}'`
cgibindir=`eval echo $cgibindir`
- cgiuri=`grep '^ScriptAlias.*/cgi-bin/' $httpd_conf|awk '{print $2}'`
+ cgiuri=`grep '^ScriptAlias.*/cgi-bin/' $httpdconf|awk '{print $2}'`
# configuration files and etc.
- contextdir=/etc/dsgw
+ contextdir=$sysconfdir/dsgw
propertydir=$contextdir
securitydir=$contextdir
- cookiedir=/var/run/dsgw/cookies
+ cookiedir=$localstatedir/run/dsgw/cookies
fi
@@ -6922,6 +6923,8 @@
+
+
# need a check here to see if the ldif functions are exported from libldap
# for now, just assume they are not
@@ -6947,7 +6950,7 @@
fi
- ac_config_files="$ac_config_files Makefile setup"
+ ac_config_files="$ac_config_files Makefile setup dsgw-httpd.conf"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -7514,6 +7517,7 @@
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"setup" ) CONFIG_FILES="$CONFIG_FILES setup" ;;
+ "dsgw-httpd.conf" ) CONFIG_FILES="$CONFIG_FILES dsgw-httpd.conf" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config-h.in" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -7659,6 +7663,7 @@
s, at icu_inc@,$icu_inc,;t t
s, at icu_bin@,$icu_bin,;t t
s, at cgibindir@,$cgibindir,;t t
+s, at cgiuri@,$cgiuri,;t t
s, at propertydir@,$propertydir,;t t
s, at htmldir@,$htmldir,;t t
s, at pbhtmldir@,$pbhtmldir,;t t
@@ -7667,6 +7672,7 @@
s, at contextdir@,$contextdir,;t t
s, at securitydir@,$securitydir,;t t
s, at cookiedir@,$cookiedir,;t t
+s, at httpdconf@,$httpdconf,;t t
s, at NEED_LDIF_TRUE@,$NEED_LDIF_TRUE,;t t
s, at NEED_LDIF_FALSE@,$NEED_LDIF_FALSE,;t t
s, at WINNT_TRUE@,$WINNT_TRUE,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure.ac 1 Jun 2006 19:43:45 -0000 1.1.1.1
+++ configure.ac 2 Jun 2006 22:57:17 -0000 1.2
@@ -96,6 +96,7 @@
# write out paths for data/config files
AC_SUBST(cgibindir)
+AC_SUBST(cgiuri)
AC_SUBST(propertydir)
AC_SUBST(htmldir)
AC_SUBST(pbhtmldir)
@@ -104,6 +105,7 @@
AC_SUBST(contextdir)
AC_SUBST(securitydir)
AC_SUBST(cookiedir)
+AC_SUBST(httpdconf)
# need a check here to see if the ldif functions are exported from libldap
# for now, just assume they are not
@@ -112,5 +114,5 @@
# cygnus, mingw, or the like and using cmd.exe as the shell
AM_CONDITIONAL([WINNT], false)
-AC_CONFIG_FILES([Makefile setup])
+AC_CONFIG_FILES([Makefile setup dsgw-httpd.conf])
AC_OUTPUT
Index: dsgw-httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw-httpd.conf.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dsgw-httpd.conf.in 1 Jun 2006 19:43:42 -0000 1.1.1.1
+++ dsgw-httpd.conf.in 2 Jun 2006 22:57:17 -0000 1.2
@@ -16,14 +16,19 @@
# END COPYRIGHT BLOCK
#
# This file is the Apache config file that can be dropped into
-# the /etc/httpd/conf.d directory to enable the dsgw. It uses ScriptAlias to
-# enable incoming requests for CGIs in @cgiurl@ to execute CGIs in @cgibindir@
-# It then uses access control to allow clients to access files in the html
-# directory @htmldir@, the html template directory @configdir@, and the
-# CGI bin directory @cgibindir@
+# the /etc/httpd/conf.d directory, or Include'd by httpd.conf, to enable the
+# dsgw. It uses ScriptAlias to enable incoming requests for CGIs in @cgiurl@
+# to execute CGIs in @cgibindir at . It then uses access control to allow clients
+# to access files in the html directory @htmldir@, the html template directory
+# @configdir@, and the CGI bin directory @cgibindir@
+# Tell CGI progs where to find the config files
+SetEnv DSGW_CONTEXT_DIR "@contextdir@"
+
+# Enable CGI execution for these uris in this directory
ScriptAlias @cgiuri@ "@cgibindir@"
+# Allow access to the dsgw html files
<Directory "@htmldir@">
AllowOverride None
Options None
@@ -31,6 +36,15 @@
Allow from all
</Directory>
+# Allow access to the pb html files
+<Directory "@pbhtmldir@">
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+</Directory>
+
+# Allow access to the dsgw html templates
<Directory "@configdir@">
AllowOverride None
Options None
@@ -38,6 +52,15 @@
Allow from all
</Directory>
+# Allow access to the pb html templates
+<Directory "@pbconfigdir@">
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+</Directory>
+
+# Allow access to the cgi programs
<Directory "@cgibindir@">
AllowOverride None
Options None
Index: setup.in
===================================================================
RCS file: /cvs/dirsec/dsgw/setup.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- setup.in 1 Jun 2006 19:43:44 -0000 1.1.1.1
+++ setup.in 2 Jun 2006 22:57:17 -0000 1.2
@@ -113,7 +113,7 @@
getValFromInf() {
cattr=$1
cfile=$2
- rval=`grep -i ^$cattr $cfile | head -1 | sed -e 's/^.*=[ ]*//'`
+ rval=`grep -i ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*=[ ]*//"`
echo $rval
}
@@ -240,20 +240,35 @@
fi
# generate dsgw.conf and pb.conf and default.conf in the @contextdir@ directory
-sed -e "s, at host@,$hostname,g" \
- -e "s, at port@,$port,g" \
- -e "s, at suffix@,$suffix,g" \
- -e "s, at dirmgr@,$dirmgr,g" \
- -e "s,\@contextdir\@, at contextdir@,g" \
+sed -e "s#@host@#$hostname#g" \
+ -e "s#@port@#$port#g" \
+ -e "s#@suffix@#$suffix#g" \
+ -e "s#@dirmgr@#$dirmgr#g" \
+ -e "s#\@contextdir\@#@contextdir@#g" \
@configdir@/dsgw.tmpl > @contextdir@/dsgw.conf
-sed -e "s, at host@,$hostname,g" \
- -e "s, at port@,$port,g" \
- -e "s, at suffix@,$suffix,g" \
- -e "s, at dirmgr@,$dirmgr,g" \
- -e "s,\@contextdir\@, at contextdir@,g" \
+sed -e "s#@host@#$hostname#g" \
+ -e "s#@port@#$port#g" \
+ -e "s#@suffix@#$suffix#g" \
+ -e "s#@dirmgr@#$dirmgr#g" \
+ -e "s#\@contextdir\@#@contextdir@#g" \
@pbconfigdir@/pb.tmpl > @contextdir@/pb.conf
+# the default.conf is just a copy of dsgw.conf
cp @contextdir@/dsgw.conf @contextdir@/default.conf
+# tell Apache about the dsgw - must restart Apache
+grep dsgw-httpd.conf "@httpdconf@" > /dev/null 2>&1 || (echo "" ; echo "# DSGW configuration" ; echo "Include @contextdir@/dsgw-httpd.conf") >> @httpdconf@
+
+echo "The DSGW has been successfully configured."
+if [ $isAdmServ ] ; then
+ echo "Please restart the Admin Server - /path/to/start-admin "
+else
+ echo "Please restart Apache e.g."
+ echo " service httpd restart"
+ echo " OR"
+ echo " apachectl restart"
+ echo "or however you restart apache on this system."
+fi
+
exit 0
- Previous message (by thread): [Fedora-directory-commits] adminserver/admserv/console/src/com/netscape/management/admserv/task AdminTaskObject.java, 1.3, NONE CertSetup.java, 1.3, NONE Logging.java, 1.3, NONE Restart.java, 1.3, NONE SNMPSetup.java, 1.3, NONE ServerSetup.java, 1.3, NONE Stop.java, 1.3, NONE
- Next message (by thread): [Fedora-directory-commits] dsgw/m4 httpd.m4,1.1.1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list