X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=ee42a5962aaae46e6a68942398e438feebda479d;hp=271a361159e32d83305082ce500bc9223c468a92;hb=34eb85be541335c5b4b92cc8e926b472f0515113;hpb=ff27ffb0342e4d630a9426a998ffe76de9d6ed8c diff --git a/Makefile b/Makefile index 271a36115..ee42a5962 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,10 @@ DIST_CONF = ${FREESIDE_CONF}/default_conf #Apache 2.4 (Debian 8.x) APACHE_VERSION=2.4 -#deb +#deb (-7 and upgrades) FREESIDE_DOCUMENT_ROOT = /var/www/freeside +#deb (new installs of 8+) (plus needs more work w/new auth) +#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside #redhat, fedora, mandrake #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside #freebsd @@ -50,7 +52,7 @@ INIT_FILE = /etc/init.d/freeside #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh #deb -INIT_INSTALL = PATH=$PATH:/sbin /usr/sbin/update-rc.d freeside defaults 23 01 +INIT_INSTALL = PATH=${PATH}:/sbin /usr/sbin/update-rc.d freeside defaults 23 01 #redhat, fedora #INIT_INSTALL = /sbin/chkconfig freeside on #not necessary (freebsd) @@ -106,7 +108,7 @@ RT_ENABLED = 1 RT_DOMAIN = example.com RT_TIMEZONE = US/Pacific #RT_TIMEZONE = US/Eastern -FREESIDE_URL = "http://localhost/freeside/" +FREESIDE_URL = "http://192.168.1.6/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside @@ -460,7 +462,7 @@ release: #cd /home/ivan git archive --prefix=freeside-${VERSION}/ ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz - scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/ + scp freeside-${VERSION}.tar.gz ivan@freeside.biz:/var/www/www.freeside.biz/freeside/ mv freeside-${VERSION}.tar.gz .. #these things failing should not make release target fail, so: "|| true"