projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #31495 Earthlink CDR format
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
271a361
..
99e3dbc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-31,8
+31,10
@@
DIST_CONF = ${FREESIDE_CONF}/default_conf
#Apache 2.4 (Debian 8.x)
APACHE_VERSION=2.4
#Apache 2.4 (Debian 8.x)
APACHE_VERSION=2.4
-#deb
+#deb
(-7 and upgrades)
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#deb (new installs of 8+)
+#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
#redhat, fedora, mandrake
#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
#freebsd
#redhat, fedora, mandrake
#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
#freebsd
@@
-106,7
+108,7
@@
RT_ENABLED = 1
RT_DOMAIN = example.com
RT_TIMEZONE = US/Pacific
#RT_TIMEZONE = US/Eastern
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
#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
#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"
mv freeside-${VERSION}.tar.gz ..
#these things failing should not make release target fail, so: "|| true"