X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=fec88546ab50b1ad956969691bbe99868215753d;hb=804a4999a84b827ac4ec3fa34158e097da31ade3;hp=4c23b8dba4e13bbbf500a088a3c629f6e3ff44a4;hpb=625f6e43b7345f04cf4ece8dd9ff963b9b09f338;p=freeside.git diff --git a/Makefile b/Makefile index 4c23b8dba..fec88546a 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,14 @@ #solaris and perhaps other very weirdass /bin/sh #SHELL="/bin/ksh" -DATASOURCE = DBI:Pg:dbname=freeside -#DATASOURCE=DBI:mysql:freeside +DB_TYPE = Pg +#DB_TYPE = mysql DB_USER = freeside DB_PASSWORD= +DATASOURCE = DBI:${DB_TYPE}:dbname=freeside + #changable now (some things which should go to the others still go to CONF) FREESIDE_CONF = /usr/local/etc/freeside FREESIDE_LOG = /usr/local/etc/freeside @@ -19,13 +21,13 @@ FREESIDE_EXPORT = /usr/local/etc/freeside MASON_HANDLER = ${FREESIDE_CONF}/handler.pl MASONDATA = ${FREESIDE_CACHE}/masondata -#yup +#mod_perl v1 APACHE_VERSION = 1 +#mod_perl v2 prereleases up to and including 1.999_21 +#APACHE_VERSON = 1.99 +#mod_perl v2 proper and prereleases 1.999_22 and after #APACHE_VERSION = 2 -# only mason now -TEMPLATE = mason - #deb FREESIDE_DOCUMENT_ROOT = /var/www/freeside #redhat, fedora, mandrake @@ -109,8 +111,8 @@ RT_PATH = /opt/rt3 FREESIDE_PATH = `pwd` PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/ -VERSION=1.7.1 -TAG=freeside_1_7_1 +VERSION=1.9.0cvs +TAG=freeside_1_9_0 help: @echo "supported targets:" @@ -127,14 +129,13 @@ help: @echo " dev dev-docs dev-perl-modules" @echo @echo " masondocs alldocs docs" - @echo " htmlman forcehtmlman" + @echo " wikiman" @echo " perl-modules" #@echo #@echo " upload-docs release update-webdemo" -#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/* -masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* +masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* rm -rf masondocs cp -pr httemplate masondocs touch masondocs @@ -142,28 +143,15 @@ masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/* alldocs: 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 ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export - chmod a+rx bin/pod2x - [ -e DONT_REBUILD_DOCS ] || bin/pod2x - -forcehtmlman: - [ -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 ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export - bin/pod2x + make masondocs + +wikiman: + chmod a+rx ./bin/pod2x + ./bin/pod2x 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} + cp -r masondocs ${FREESIDE_DOCUMENT_ROOT} chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT} cp htetc/handler.pl ${MASON_HANDLER} perl -p -i -e "\ @@ -252,8 +240,7 @@ install-selfservice: ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\ ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\ scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\ - ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/" ;\ - ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\ + ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\ ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\ done @@ -310,7 +297,7 @@ configure-rt: s'%%%MASONDATA%%%'${MASONDATA}'g;\ " config.layout; \ ./configure --enable-layout=Freeside\ - --with-db-type=Pg \ + --with-db-type=${DB_TYPE} \ --with-db-dba=${DB_USER} \ --with-db-database=${RT_DB_DATABASE} \ --with-db-rt-user=${DB_USER} \ @@ -324,23 +311,20 @@ create-rt: configure-rt [ -d /opt/rt3 ] || mkdir /opt/rt3 # [ -d /opt/rt3/share ] || mkdir /opt/rt3/share # cd rt; make install - echo -e "${DB_PASSWORD}\n\\d sessions"\ - | psql -U ${DB_USER} -W ${RT_DB_DATABASE} 2>&1\ - | grep '^Did not find'\ - && rt/sbin/rt-setup-database --dba '${DB_USER}' \ - --dba-password '${DB_PASSWORD}' \ - --action schema \ + rt/sbin/rt-setup-database --dba '${DB_USER}' \ + -dba-password '${DB_PASSWORD}' \ + -action schema \ || true rt/sbin/rt-setup-database --action insert_initial \ && rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \ || true + +install-rt: perl -p -i -e "\ s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\ s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\ s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ " ${RT_PATH}/etc/RT_SiteConfig.pm - -install-rt: [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true clean: @@ -355,10 +339,6 @@ clean: #these are probably only useful if you're me... -upload-docs: forcehtmlman - ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs - scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs - #release: upload-docs release: cd /home/ivan/freeside