GopherProxy

	Switch to config for all files - warvox - VoIP based wardialing tool, forked fr…
	Log
	Files
	Refs
	README
	---
	commit b3dcc20681e6042e497c3d558af663d59eef4a9e
	parent 2f9ae946a773cf231a7321c9397703b231cad481
	Author: HD Moore <[email protected]>
	Date: Wed, 26 Dec 2012 23:06:26 -0600

	Switch to config for all files

	Diffstat:
	M bin/verify_install.rb \| 26 +++++++-------------------
	R etc/blacklist.txt -> config/blackl… \| 0
	R etc/sigs/01.default.rb -> config/s… \| 0
	R etc/sigs/99.default.rb -> config/s… \| 0
	R etc/warvox.conf -> config/warvox.c… \| 0
	M lib/warvox.rb \| 4 ++--

	6 files changed, 9 insertions(+), 21 deletions(-)
	---
	diff --git a/bin/verify_install.rb b/bin/verify_install.rb
	@@ -67,25 +67,13 @@ puts " "
	puts "[*] Congratulations! You are almost ready to run WarVOX"
	puts " "
	puts "[*] Configuring the PostgreSQL database server:"
	-puts "[*] 1. Install postgresql:"
	+puts "[*] 1. Install postgresql (9.1 or newer):"
	puts "[*] $ sudo apt-get install postgresql"
	puts "[*]"
	puts "[*] 2. Install postgresql community contributed modules:"
	puts "[*] $ sudo apt-get install postgresql-contrib"
	puts "[*]"
	-puts "[*] 3. Load contributed integer routines into template1:"
	-puts "[*] $ sudo su - postgres"
	-puts "[*] $ psql template1"
	-puts "[*]"
	-puts "[*] PostgreSQL 9.0+:"
	-puts "[*] psql> CREATE EXTENSION intarray"
	-puts "[*] psql> exit"
	-puts "[*]"
	-puts "[*] PostgreSQL 8.4:"
	-puts "[*] psql> \\i /usr/share/postgresql/8.4/contrib/_int.sql"
	-puts "[*] psql> exit"
	-puts "[*]"
	-puts "[*] 4. Configure a user account, password, and database for WarVOX:"
	+puts "[*] 3. Configure a user account, password, and database for WarVOX:"
	puts "[*] $ sudo su - postgres"
	puts "[*] $ createuser warvox"
	puts "[*] $ createdb warvox -O warvox"
	@@ -93,14 +81,14 @@ puts "[*] $ psql"
	puts "[*] psql> alter user warvox with password 'randompass';"
	puts "[*] psql> exit"
	puts "[*]"
	-puts "[*] 5. Modify config/database.yml to match this password"
	+puts "[*] 4. Modify config/database.yml to match this password"
	puts "[*]"
	-puts "[*] 6. Modify etc/warvox.conf and set a UI password"
	+puts "[*] 5. Modify config/warvox.conf and set a UI password"
	puts "[*]"
	-puts "[*] 7. Initialize the WarVOX database"
	+puts "[*] 6. Initialize the WarVOX database"
	puts "[*] $ make db"
	puts "[*]"
	-puts "[*] 8. Start WarVOX with bin/warvox.rb"
	+puts "[*] 7. Start WarVOX with bin/warvox.rb"
	puts "[*]"
	-puts "[*] 9. Login to http://127.0.0.1:7777/"
	+puts "[*] 8. Login to http://127.0.0.1:7777/"
	puts "[*]"
	diff --git a/etc/blacklist.txt b/config/blacklist.txt
	diff --git a/etc/sigs/01.default.rb b/config/sigs/01.default.rb
	diff --git a/etc/sigs/99.default.rb b/config/sigs/99.default.rb
	diff --git a/etc/warvox.conf b/config/warvox.conf
	diff --git a/lib/warvox.rb b/lib/warvox.rb
	@@ -10,8 +10,8 @@ require 'warvox/audio'

	# Global configuration
	module WarVOX
	- VERSION = '1.9.9-dev'
	+ VERSION = '2.0.0-dev'
	Base = File.expand_path(File.join(File.dirname(__FILE__), '..'))
	- Conf = File.expand_path(File.join(Base, 'etc', 'warvox.conf'))
	+ Conf = File.expand_path(File.join(Base, 'config', 'warvox.conf'))
	JobManager = WarVOX::JobQueue.new
	end