[freeside-commits] branch master updated. 0b07929c5a6f2654d91db7f7ba8951e3c2a46093

[Alex Brelsfoard]

The branch, master has been updated
       via  0b07929c5a6f2654d91db7f7ba8951e3c2a46093 (commit)
       via  05889be74afd7e845b24ed75252026a466fe1ff2 (commit)
      from  c21244410514448a34d732c802ca1d3325448dff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0b07929c5a6f2654d91db7f7ba8951e3c2a46093
Merge: 05889be c212444
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Tue Jan 27 19:24:58 2015 -0500

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


c21244410514448a34d732c802ca1d3325448dff
diff --git a/Makefile b/Makefile
index b3b556c..67bf83c 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,9 +27,9 @@ 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
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -71,9 +71,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 +103,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

commit 05889be74afd7e845b24ed75252026a466fe1ff2
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Tue Jan 27 19:24:04 2015 -0500

    RT #29800: converting the DID range from numeric to string to maintain leading zeroes

diff --git a/httemplate/edit/process/bulk-svc_phone.html b/httemplate/edit/process/bulk-svc_phone.html
index 5a1fbc6..db486de 100644
--- a/httemplate/edit/process/bulk-svc_phone.html
+++ b/httemplate/edit/process/bulk-svc_phone.html
@@ -25,7 +25,7 @@ my $num_avail = $1;
 errorpage("There are only $num_avail available")
   if $end - $start + 1 > $num_avail;
 
-foreach my $phonenum ( $start .. $end ) {
+foreach my $phonenum ( "$start" .. "$end" ) {
 
   my $svc_phone = new FS::svc_phone {
     'phonenum' => $phonenum,

c21244410514448a34d732c802ca1d3325448dff
diff --git a/Makefile b/Makefile
index b3b556c..67bf83c 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,9 +27,9 @@ 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
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -71,9 +71,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 +103,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

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/process/bulk-svc_phone.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)