X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=99e3dbc478cae348cc5d1bc51f7b6f99d1816a69;hb=d0295833c7e240698bfd7b3a9bddf2024a602253;hp=b3b556caea409a3222786614e59a1a8fec06e372;hpb=f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8;p=freeside.git

diff --git a/Makefile b/Makefile
index b3b556cae..99e3dbc47 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ DB_TYPE = Pg
 #DB_TYPE = mysql
 
 DB_USER = freeside
-DB_PASSWORD=hRoVj902
+DB_PASSWORD=
 
 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)
-APACHE_VERSION=2
+#APACHE_VERSION=2
 #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
+#deb (new installs of 8+)
+#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #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
-#APACHE_CONF = /etc/apache2/conf-available
+APACHE_CONF = /etc/apache2/conf-available
 #deb (3.1+), apache2
-APACHE_CONF = /etc/apache2/conf.d
+#APACHE_CONF = /etc/apache2/conf.d
 
 INSSERV_OVERRIDE = /etc/insserv/overrides
 
@@ -103,10 +105,10 @@ SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
 
 #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
-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