X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=34259737bba37f8175f4a030e0a66d8c843080ec;hp=3b0262523a9b44f0f3baa51d5bfc51ada09ad853;hb=b35b650a6078d645d6f97620f3c79ae941915dd9;hpb=edda09a317f5dfef05fb8906f28531ec6f4b0927

diff --git a/Makefile b/Makefile
index 3b0262523..34259737b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,26 @@
 
 DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
-#pgsql on some systems; check /etc/passwd
 
 DB_USER = freeside
 DB_PASSWORD=
 
+<<<<<<< Makefile
+#TEMPLATE = asp
+#mason's a bit dodgy still
+TEMPLATE = mason
+=======
 TEMPLATE = asp
-#mason's a bit dodgy stil
 #TEMPLATE = mason
+>>>>>>> 1.27
+
+ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+HTTPD_RESTART = /etc/init.d/apache restart
+QUEUED_RESTART = /etc/init.d/freeside restart
+
 #---
 
 #not changable yet
@@ -20,17 +29,18 @@ FREESIDE_CONF = /usr/local/etc/freeside
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
+	@echo "                   htmlman"
 	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
 	@echo "                   create-database"
 	@echo "                   clean"
 
-aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
 	cp -pr httemplate aspdocs
 	touch aspdocs
 
-masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
@@ -43,8 +53,23 @@ alldocs: aspdocs masondocs
 docs:
 	make ${TEMPLATE}docs
 
+htmlman:
+	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
+	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
+	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
+	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
+
+upload-docs:
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+
 install-docs: docs
+	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
 
 perl-modules:
 	cd FS; \
@@ -58,32 +83,37 @@ install-perl-modules: perl-modules
 install: install-perl-modules install-docs
 
 deploy: install
-	/etc/init.d/apache restart
+	${HTTPD_RESTART}
+	${QUEUED_RESTART}
 
 create-database:
-	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
+	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
-	[ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
+	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
+	mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
+	touch ${FREESIDE_CONF}/secrets
+	chown freeside ${FREESIDE_CONF}/secrets
+	chmod 600 ${FREESIDE_CONF}/secrets
+
 	echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+	chmod 600 ${FREESIDE_CONF}/secrets
+	chown freeside ${FREESIDE_CONF}/secrets
 
-	[ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/conf.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
-	[ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/counters.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
 
-	[ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/cache.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
 
-	[ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
-	  || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF/export.${DATASOURCE}"
+	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
+	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
 clean:
 	rm -rf aspdocs masondocs