Update of /cvs/scoop/scoop/etc
In directory lithium.sabren.com:/tmp/cvs-serv31385/etc
Modified Files:
httpd-location.conf httpd-vhost.conf startup.pl
Log Message:
In preparation for Scoop 1.2's eventual release, committing support for master and slave databases. -j
Index: startup.pl
===================================================================
RCS file: /cvs/scoop/scoop/etc/startup.pl,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** startup.pl 26 Apr 2006 20:56:47 -0000 1.73
--- startup.pl 27 Apr 2006 03:52:47 -0000 1.74
***************
*** 117,120 ****
--- 117,121 ----
use Scoop::Ads;
use Scoop::DB;
+ use Scoop::DB::SlaveUtils;
use Scoop::Interface;
use Scoop::Boxes;
Index: httpd-vhost.conf
===================================================================
RCS file: /cvs/scoop/scoop/etc/httpd-vhost.conf,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** httpd-vhost.conf 26 Apr 2006 20:56:47 -0000 1.32
--- httpd-vhost.conf 27 Apr 2006 03:52:47 -0000 1.33
***************
*** 128,131 ****
--- 128,160 ----
#PerlSetVar memcached_compress 10_000
+ # Slave Config
+ # Set this if you're using a slave db
+ #PerlSetVar db_name_slave __SLAVENAME__
+
+ # the slave host. If you have more than one, seperate them with
+ # commas: i.e., 1.2.3.4,1.2.3.5,1.2.3.6
+ #PerlSetVar db_host_slave __SLAVEHOST__
+
+ # slave db user
+ #PerlSetVar db_user_slave __SLAVEUSER__
+
+ # slave db pass
+ #PerlSetVar db_pass_slave __SLAVEPASS__
+
+ # Archive Slave Config
+ # Set this if you're using a slave archive db
+ #PerlSetVar db_name_slave_arch __SLAVENAMEARCH__
+
+ # the slave host. If you have more than one, seperate them with
+ # commas: i.e., 1.2.3.4,1.2.3.5,1.2.3.6
+ #PerlSetVar db_host_slave_arch __SLAVEHOSTARCH__
+
+ # slave db user
+ #PerlSetVar db_user_slave_arch __SLAVEUSERARCH__
+
+ # slave db pass
+ #PerlSetVar db_pass_slave_arch __SLAVEPASSARCH__
+
+
# Set below to your host name if you're
# using a two-server proxy type system.
Index: httpd-location.conf
===================================================================
RCS file: /cvs/scoop/scoop/etc/httpd-location.conf,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** httpd-location.conf 26 Apr 2006 20:56:47 -0000 1.28
--- httpd-location.conf 27 Apr 2006 03:52:47 -0000 1.29
***************
*** 134,137 ****
--- 134,165 ----
#PerlSetVar memcached_compress 10_000
+ # Slave Config
+ # Set this if you're using a slave db
+ #PerlSetVar db_name_slave __SLAVENAME__
+
+ # the slave host. If you have more than one, seperate them with
+ # commas: i.e., 1.2.3.4,1.2.3.5,1.2.3.6
+ #PerlSetVar db_host_slave __SLAVEHOST__
+
+ # slave db user
+ #PerlSetVar db_user_slave __SLAVEUSER__
+
+ # slave db pass
+ #PerlSetVar db_pass_slave __SLAVEPASS__
+
+ # Archive Slave Config
+ # Set this if you're using a slave archive db
+ #PerlSetVar db_name_slave_arch __SLAVENAMEARCH__
+
+ # the slave host. If you have more than one, seperate them with
+ # commas: i.e., 1.2.3.4,1.2.3.5,1.2.3.6
+ #PerlSetVar db_host_slave_arch __SLAVEHOSTARCH__
+
+ # slave db user
+ #PerlSetVar db_user_slave_arch __SLAVEUSERARCH__
+
+ # slave db pass
+ #PerlSetVar db_pass_slave_arch __SLAVEPASSARCH__
+
# Set below to your host name if you're
# using a two-server proxy type system.