CVS: ispman Makefile,1.55,1.55.2.1 Makefile.README,1.2,1.2.4.1 configure,1.7,1.7.2.1

Tarjei Huse <[email protected]>
Newsgroups gmane.comp.isp.ispman.cvs
Message-ID <[email protected]>
Update of /cvsroot/ispman/ispman
In directory sc8-pr-cvs1:/tmp/cvs-serv30245

Modified Files:
      Tag: ALTVHOSTS
	Makefile Makefile.README configure 
Log Message:
This should be everything for the ALTVHOSTbranch to be functional.

The todolist is long, but at least it's all commited now.




Index: Makefile
===================================================================
RCS file: /cvsroot/ispman/ispman/Makefile,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -C2 -r1.55 -r1.55.2.1
*** Makefile	2 Aug 2003 04:35:56 -0000	1.55
--- Makefile	8 Sep 2003 16:19:18 -0000	1.55.2.1
***************
*** 31,35 ****
  	cp  install-data/schema/dnszone.schema tmp/conf/schema/
  	cp  install-data/schema/pureftpd.schema tmp/conf/schema/
! 	cp  install-data/schema/RADIUS-LDAPv3.schema tmp/conf/schema/
  	@echo Copying pureftpd.schema, dnszone.schema, RADIUS-LDAPv3.schema and ispman.schema
  	@echo to tmp/conf/schema/. Please copy them to your schema directory
--- 31,35 ----
  	cp  install-data/schema/dnszone.schema tmp/conf/schema/
  	cp  install-data/schema/pureftpd.schema tmp/conf/schema/
! #	cp  install-data/schema/RADIUS-LDAPv3.schema tmp/conf/schema/
  	@echo Copying pureftpd.schema, dnszone.schema, RADIUS-LDAPv3.schema and ispman.schema
  	@echo to tmp/conf/schema/. Please copy them to your schema directory
***************
*** 79,84 ****
  	@echo '1;' >> tmp/conf/ispman.conf
  
! 
! 
  
  
--- 79,87 ----
  	@echo '1;' >> tmp/conf/ispman.conf
  
! midgard:
! 	@perl scripts/make_midgard.pl
! 	@cat install-data/ispman.config >> tmp/conf/ispman.conf
! 	@cat install-data/ldifs/ispmanVarSort.conf >> tmp/conf/ispman.conf
! 	@echo '1;' >> tmp/conf/ispman.conf
  
  
***************
*** 95,103 ****
  	@perl scripts/subs.pl install-data/ldifs/base.ldif >tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.apache_vars.ldif >>tmp/ldif/ispman.ldif
- 	@perl scripts/subs.pl install-data/ldifs/conf.ftp_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.dns_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.ldap_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.mail_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.sys_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.account_vars.ldif >>tmp/ldif/ispman.ldif
--- 98,107 ----
  	@perl scripts/subs.pl install-data/ldifs/base.ldif >tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.ldif >>tmp/ldif/ispman.ldif
+ 	@perl scripts/subs.pl install-data/ldifs/conf.vhost_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.apache_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.dns_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.ldap_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.mail_vars.ldif >>tmp/ldif/ispman.ldif
+ 	@perl scripts/subs.pl install-data/ldifs/conf.midgard_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.sys_vars.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/conf.account_vars.ldif >>tmp/ldif/ispman.ldif
***************
*** 107,111 ****
  	@perl scripts/subs.pl install-data/ldifs/hostgroups.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/domainServices.ldif >>tmp/ldif/ispman.ldif
- 	@perl scripts/subs.pl install-data/ldifs/radiusprofiles.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/subs.pl install-data/ldifs/processes.ldif >>tmp/ldif/ispman.ldif
  	@perl scripts/fixldif.pl tmp/ldif/ispman.ldif >tmp/ispman.ldif
--- 111,114 ----
***************
*** 181,184 ****
--- 184,189 ----
  	test -d $(ISPMAN_INSTALL_PATH)/htdocs || mkdir $(ISPMAN_INSTALL_PATH)/htdocs 2>/dev/null
  	test -d $(ISPMAN_INSTALL_PATH)/cgi-bin || mkdir $(ISPMAN_INSTALL_PATH)/cgi-bin 2>/dev/null
+ 	cp -r ispman-web/htdocs build/
+ 	cp -r ispman-web/cgi-bin build/
  	cp -r build/htdocs		$(ISPMAN_INSTALL_PATH)/
  	cp -r build/cgi-bin	$(ISPMAN_INSTALL_PATH)/

Index: Makefile.README
===================================================================
RCS file: /cvsroot/ispman/ispman/Makefile.README,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** Makefile.README	4 May 2002 23:13:48 -0000	1.2
--- Makefile.README	8 Sep 2003 16:19:18 -0000	1.2.4.1
***************
*** 21,24 ****
--- 21,30 ----
  
  -------------------------------------------------------------------------------
+ make midgard                | If you want midgard integration into ispman run
+                             | this AFTER make ispman and it will create the 
+                             | correct templates. See also README.midgard.
+ -------------------------------------------------------------------------------
+ 
+ -------------------------------------------------------------------------------
  make ldif-install           | this will enter data in your blank ldap directory
  -------------------------------------------------------------------------------
***************
*** 26,29 ****
--- 32,39 ----
  -------------------------------------------------------------------------------
  make install_ispman_common  | common libraries and scripts. REQUIRED
+ -------------------------------------------------------------------------------
+ 
+ -------------------------------------------------------------------------------
+ make install_ispman_web     | The ispman webinterface - requires manual apachesetup
  -------------------------------------------------------------------------------
  

Index: configure
===================================================================
RCS file: /cvsroot/ispman/ispman/configure,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** configure	30 Apr 2003 16:47:57 -0000	1.7
--- configure	8 Sep 2003 16:19:18 -0000	1.7.2.1
***************
*** 17,20 ****
--- 17,22 ----
  $prefix||="/opt/ispman";
  
+ 
+         
  sub help {
  print qq|



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.