<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,6 @@
 #
 # The configuration uses the following address groups:
-# 0 -- OpenSER servers which are part of the system (used to avoid CFx loops)
+# 0 -- OpenSIPS servers which are part of the system (used to avoid CFx loops)
 # 1 -- Blacklisted IP addresses or subnets
 # 2 -- Recording server (used to avoid recording loops)
 # 
\ No newline at end of file</diff>
      <filename>CCNQ/Proxy/address_group.pm</filename>
    </modified>
    <modified>
      <diff>@@ -71,7 +71,7 @@ my %values = (
     CDR_EXTRA   =&gt; join(';',@cdr_extra),
     RADIUS_EXTRA   =&gt; join(';',@radius_extra),
     NANPA       =&gt; 1,
-    MPATH       =&gt; defined $configuration::mpath ? $configuration::mpath : '/usr/lib/openser/modules/',
+    MPATH       =&gt; defined $configuration::mpath ? $configuration::mpath : '/usr/lib/opensips/modules/',
     RADIUS_CONFIG =&gt; defined $configuration::radius_config ? $configuration::radius_config : '',
     DEBUG       =&gt; defined $configuration::debug ? $configuration::debug : 3,
     MP_ALLOWED  =&gt; defined $configuration::mp_allowed ? $configuration::mp_allowed : 1,</diff>
      <filename>CCNQ/Proxy/bin/configure.pl</filename>
    </modified>
    <modified>
      <diff>@@ -23,11 +23,11 @@
 # This script is called remotely by rotate.pl.
 
 TODAY=`/bin/date -u '+%Y%m%d-%H%M'`
-DIR=&quot;/var/log/openser/$TODAY&quot;
+DIR=&quot;/var/log/opensips/$TODAY&quot;
 
 mkdir -p &quot;${DIR}&quot;
-mv /var/log/openser/acc_*.log /var/log/openser/missed_calls_*.log &quot;${DIR}/&quot;
-/usr/sbin/openserctl fifo flat_rotate
+mv /var/log/opensips/acc_*.log /var/log/opensips/missed_calls_*.log &quot;${DIR}/&quot;
+/usr/sbin/opensipsctl fifo flat_rotate
 # Note: with FIFO we have to wait for a new CDR to be written before we can safely
 # assume the files have been closed and re-opened.
 </diff>
      <filename>CCNQ/Proxy/bin/rotate-openser.sh</filename>
    </modified>
    <modified>
      <diff>@@ -8,7 +8,7 @@
 
 # 1. Make sure OpenSER 1.2.x, Apache2 are installed.
 
-aptitude install openser-mysql-module openser-jabber-module openser-radius-modules
+aptitude install opensips-mysql-module
 
 aptitude install libjson-perl
 
@@ -31,11 +31,12 @@ cp configuration.pm.orig configuration.pm
 # and edit configuration.pm to reflect your settings.
 
 # 5. Create the directory for base configuration.
+mkdir /var/log/opensips
+chown opensips.opensips /var/log/opensips
+
 mkdir /etc/ccn
 mkdir /var/log/billing
-chown openser.openser /var/log/billing
-mkdir /var/log/openser
-chown openser.openser /var/log/openser
+# chown opensips.opensips /var/log/billing
 
 
 # To install the new openser.cfg to reflect the local configuration, do:
@@ -55,22 +56,23 @@ perl ./CCNQ/Proxy/bin/configure.pl
         allow from all
 &lt;/Directory&gt;
 
-# Edit /etc/default/openser if the server will be running openser.
+# Edit /etc/default/opensips if the server will be running openser.
 
 # Note: this adds ExecCGI and a AddHandler for .pl files,
 # and removes the RedirectMatch (installed by Debian by default).
 
 # Then run:
-/etc/init.d/openser restart
+/etc/init.d/opensips restart
 /etc/init.d/apache2 restart
 
 # Install mediaproxy
 aptitude install python python-pyrad python-mysqldb
 cd /usr/local
-MP=1.9.1
-wget http://mediaproxy.ag-projects.com/mediaproxy-${MP}.tar.gz
+MP=2.3.2
+wget http://download.ag-projects.com/MediaProxy/mediaproxy-${MP}.tar.gz
 tar xzvf mediaproxy-${MP}.tar.gz 
 rm mediaproxy-${MP}.tar.gz
+ln -s mediaproxy-${MP}/ mediaproxy
 
 cd /usr/local/mediaproxy
 cp boot/mediaproxy.debian /etc/init.d/mediaproxy</diff>
      <filename>CCNQ/Proxy/doc/install.txt</filename>
    </modified>
    <modified>
      <diff>@@ -82,7 +82,7 @@ sub _do_command_table
       if(not defined $timestamp or $timestamp eq '')
       {
         $timestamp = '';
-        $files = '/var/log/openser/acc_*.log';
+        $files = '/var/log/opensips/acc_*.log';
       }
       # Non-realtime
       else</diff>
      <filename>CCNQ/Proxy/report.pm</filename>
    </modified>
    <modified>
      <diff>@@ -235,7 +235,7 @@ modparam(&quot;acc&quot;, &quot;db_flag&quot;,2)
 modparam(&quot;acc&quot;, &quot;db_missed_flag&quot;, 3)
 modparam(&quot;acc&quot;, &quot;db_table_acc&quot;, &quot;acc&quot;)
 modparam(&quot;acc&quot;, &quot;db_table_missed_calls&quot;, &quot;missed_calls&quot;)
-modparam(&quot;acc&quot;, &quot;db_url&quot;, &quot;flatstore:/var/log/openser&quot;)
+modparam(&quot;acc&quot;, &quot;db_url&quot;, &quot;flatstore:/var/log/opensips&quot;)
 
 # Accounting via RADIUS
 #IFACCTRADIUS   modparam(&quot;acc&quot;, &quot;radius_flag&quot;, 4)</diff>
      <filename>CCNQ/Proxy/templates/openser.cfg-1.3-tentative</filename>
    </modified>
    <modified>
      <diff>@@ -36,7 +36,7 @@ our $install_dir    = '/var/www';
 # on the web server.
 # ---------------------------------------------------------------
 
-# Database access, needed for OpenSER and website.
+# Database access, needed for OpenSIPS and website.
 our $db_host        = '127.0.0.1';
 our $db_name        = 'openser';
 our $db_login       = 'openser';
@@ -47,8 +47,8 @@ our $db_password    = 'openser';
 our $sip_host       = '127.0.0.1';
 our $sip_port       = '5060';
 our $sip_challenge  = 'CarrierClass.net';
-our $openser_cfg    = '/etc/openser/openser.cfg';
-our $mpath          = '/usr/lib/openser/modules/';
+our $openser_cfg    = '/etc/opensips/opensips.cfg';
+our $mpath          = '/usr/lib/opensips/modules/';
 our $debug          = 3; # Debug level
 our $accounting     = 'flatstore'; # either flatstore or radius; currently flatstore is always enabled by default
 our $authenticate   = 'db'; # either db or radius</diff>
      <filename>configuration.pm.orig</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>3094c94d0ada537f9cc418621e3d600f5976872f</id>
    </parent>
  </parents>
  <author>
    <name>Stephane Alnet</name>
    <email>stephane@shimaore.net</email>
  </author>
  <url>http://github.com/stephanealnet/ccnq1.5/commit/c47cfdb6269ef97ea0a00baf87c303097041378d</url>
  <id>c47cfdb6269ef97ea0a00baf87c303097041378d</id>
  <committed-date>2009-03-18T08:03:41-07:00</committed-date>
  <authored-date>2009-03-18T08:03:41-07:00</authored-date>
  <message>Move to OpenSIPS.</message>
  <tree>0bcaa8039a19c75557dca716e6316605488f2ba2</tree>
  <committer>
    <name>Stephane Alnet</name>
    <email>stephane@shimaore.net</email>
  </committer>
</commit>
