projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add an ACL to control snom/vonage/etc. employee telephony integration, RT#34839
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b3b556c
..
99e3dbc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-7,7
+7,7
@@
DB_TYPE = Pg
#DB_TYPE = mysql
DB_USER = freeside
#DB_TYPE = mysql
DB_USER = freeside
-DB_PASSWORD=
hRoVj902
+DB_PASSWORD=
DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
@@
-27,12
+27,14
@@
MASONDATA = ${FREESIDE_CACHE}/masondata
DIST_CONF = ${FREESIDE_CONF}/default_conf
#mod_perl v2 1.999_22 on Apache 2.0 through 2.3 (Debian ancient through 7.x)
DIST_CONF = ${FREESIDE_CONF}/default_conf
#mod_perl v2 1.999_22 on Apache 2.0 through 2.3 (Debian ancient through 7.x)
-APACHE_VERSION=2
+
#
APACHE_VERSION=2
#Apache 2.4 (Debian 8.x)
#Apache 2.4 (Debian 8.x)
-
#
APACHE_VERSION=2.4
+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
@@
-71,9
+73,9
@@
HTTPD_RESTART = /etc/init.d/apache2 restart
#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
#debian unstable/8.0+, apache2.4
#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
#debian unstable/8.0+, apache2.4
-
#
APACHE_CONF = /etc/apache2/conf-available
+APACHE_CONF = /etc/apache2/conf-available
#deb (3.1+), apache2
#deb (3.1+), apache2
-APACHE_CONF = /etc/apache2/conf.d
+
#
APACHE_CONF = /etc/apache2/conf.d
INSSERV_OVERRIDE = /etc/insserv/overrides
INSSERV_OVERRIDE = /etc/insserv/overrides
@@
-103,10
+105,10
@@
SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
#RT_ENABLED = 0
RT_ENABLED = 1
#RT_ENABLED = 0
RT_ENABLED = 1
-RT_DOMAIN =
localhost
-RT_TIMEZONE = US/
Central
+RT_DOMAIN =
example.com
+RT_TIMEZONE = US/
Pacific
#RT_TIMEZONE = US/Eastern
#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