[freeside-commits] branch FREESIDE_3_BRANCH updated. 4eec46347070235e61d03bb93beda124906467ca

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  4eec46347070235e61d03bb93beda124906467ca (commit)
       via  269b47e6843f31a1b35f82635ed9be1d31e5275f (commit)
       via  2b6b494ee014b68d94b56ac01e71ead0dc16f9b4 (commit)
      from  eb6536b41456955fc425dba2e156a996e8fe2837 (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 4eec46347070235e61d03bb93beda124906467ca
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 13 15:49:02 2015 -0700

    webdemo hack to set IP in RT_SiteConfig.pm controlled by presence of a file instead of needing to be commented out and thus losing on upgrade

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 099603e..248c5b3 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -88,9 +88,11 @@ case "$1" in
         freeside-torrus-srvderive $QUEUED_USER
         echo "done."
 
-        #ip=`/sbin/ifconfig $IF | grep 'inet addr:' | cut -d: -f2- | cut -d' ' -f1`
-        #cp /opt/rt3/etc/RT_SiteConfig.pm.ORIG /opt/rt3/etc/RT_SiteConfig.pm
-        #perl -pi -e "s/localhost/$ip/" /opt/rt3/etc/RT_SiteConfig.pm
+        if [ -e /opt/rt3/etc/RT_SiteConfig.pm.ORIG_WEBDEMO_HACK ]; then
+          ip=`/sbin/ifconfig $IF | grep 'inet addr:' | cut -d: -f2- | cut -d' ' -f1`
+          cp /opt/rt3/etc/RT_SiteConfig.pm.ORIG_WEBDEMO_HACK /opt/rt3/etc/RT_SiteConfig.pm
+          perl -pi -e "s/localhost/$ip/" /opt/rt3/etc/RT_SiteConfig.pm
+        fi
 
         ;;
   stop)

commit 269b47e6843f31a1b35f82635ed9be1d31e5275f
Merge: 2b6b494 eb6536b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 13 15:48:48 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 2b6b494ee014b68d94b56ac01e71ead0dc16f9b4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 13 11:17:58 2015 -0700

    3.7

diff --git a/httemplate/docs/about.html b/httemplate/docs/about.html
index b61e237..8ed4089 100644
--- a/httemplate/docs/about.html
+++ b/httemplate/docs/about.html
@@ -56,7 +56,7 @@ GNU <b>Affero</b> General Public License.<BR>
 
 % unless ( $agentnum ) {
   <CENTER>
-  <FONT SIZE="-3">"What good is spilling blood?  It will not grow a thing." - R. Hunter</FONT>
+  <FONT SIZE="-3">"All the years combine; they melt into a dream" - R. Hunter</FONT>
   </CENTER>
 % }
 

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

Summary of changes:
 httemplate/docs/about.html |    2 +-
 init.d/freeside-init       |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)