Skip to content

Commit

Permalink
Preparing for release 0.70.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Sanabria committed Feb 28, 2014
1 parent cba9ca7 commit 52aa87a
Show file tree
Hide file tree
Showing 30 changed files with 46 additions and 265 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
*.pyc
*.pyo
var/
conf/nginx/vFense.conf
var/rethinkdb
var/scheduler
var/redis
var/packages
var/tmp
/var/log/*.log
20 changes: 18 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
rv
vFense 0.7.0
==

New Implementation of RemediationVault
HowTo Install vFense Server Application

Download the latest Release

1. tar -xzvf 0.7.0.tar.gz
2. mv vFense-0.70.0 /opt/TopPatch
3. cd /opt/TopPatch
4. source bin/activate_toppatch
5. python tp/src/scripts initialize_vFense.py --password=password_goes_here
6. wait a while ( Pulling down the latest CVE/NVD, and Ubuntu USN data )
7. sudo cp /opt/TopPatch/tp/src/daemon/vFense /etc/init.d/
8. sudo cp /opt/TopPatch/tp/src/daemon/nginx /etc/init.d/
9. sudo update-rc.d vFense defaults
10. sudo udpate-rc.d nginx defaults
11. sudo service nginx start
12. sudo service vFense start

2 changes: 1 addition & 1 deletion conf/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ http {
# Virtual Host Configs
##

include /opt/TopPatch/conf/nginx/nginx-remediation_vault.conf;
include /opt/TopPatch/conf/nginx/vFense.conf;
}
142 changes: 0 additions & 142 deletions conf/nginx/nginx-remediation_vault.conf

This file was deleted.

7 changes: 7 additions & 0 deletions logs/error.log
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@
2013/10/19 12:46:36 [warn] 17809#0: low address bits of 192.168.8.0/16 are meaningless in /opt/TopPatch/conf/nginx/nginx-remediation_vault.conf:61
2013/10/19 12:46:43 [warn] 17820#0: low address bits of 192.168.8.0/16 are meaningless in /opt/TopPatch/conf/nginx/nginx-remediation_vault.conf:61
2013/10/19 12:46:44 [warn] 17824#0: low address bits of 192.168.8.0/16 are meaningless in /opt/TopPatch/conf/nginx/nginx-remediation_vault.conf:61
2014/02/28 09:21:10 [warn] 50158#0: the "user" directive makes sense only if the master process runs with super-user privileges, ignored in /opt/TopPatch/conf/nginx.conf:1
2014/02/28 09:21:10 [emerg] 50158#0: open() "/opt/TopPatch/var/tmp/nginx.pid" failed (13: Permission denied)
2014/02/28 09:37:20 [emerg] 51576#0: open() "/opt/TopPatch/conf/nginx/nginx-remediation_vault.conf" failed (2: No such file or directory) in /opt/TopPatch/conf/nginx.conf:48
2014/02/28 09:38:36 [emerg] 51708#0: open() "/opt/TopPatch/conf/nginx/nginx-remediation_vault.conf" failed (2: No such file or directory) in /opt/TopPatch/conf/nginx.conf:48
2014/02/28 09:38:46 [warn] 51725#0: the "user" directive makes sense only if the master process runs with super-user privileges, ignored in /opt/TopPatch/conf/nginx.conf:1
2014/02/28 09:38:46 [emerg] 51725#0: open() "/opt/TopPatch/conf/nginx/nginx-remediation_vault.conf" failed (2: No such file or directory) in /opt/TopPatch/conf/nginx.conf:48
2014/02/28 09:39:07 [warn] 51745#0: the "user" directive makes sense only if the master process runs with super-user privileges, ignored in /opt/TopPatch/conf/nginx.conf:1
6 changes: 3 additions & 3 deletions tp/src/daemon/rvserver → tp/src/daemon/vFense
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#! /bin/sh

PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=TopPatchServer
DESC=TopPatchServer
NAME=vFense
DESC=vFense
TOPPATCHDIR=/opt/TopPatch
DAEMON=/opt/TopPatch/tp/src/daemon/TopPatchd
DAEMON=/opt/TopPatch/tp/src/daemon/vFensed
USER=toppatch

set -e
Expand Down
10 changes: 2 additions & 8 deletions tp/src/daemon/TopPatchd → tp/src/daemon/vFensed
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ for queue in RQ_WORKER_QUEUES:

#################################################################
RVL_PORTS = range(9020, 9030)
RVLISTENER = 'src/rvlistener.py'
RVLISTENER = 'src/vFense_listener.py'
for port in RVL_PORTS:
pid_file = '%sRVL_PID_%s.pid' % (PID_DIR, str(port))
rvl = 'RvListener port %s' % (str(port))
Expand All @@ -49,7 +49,7 @@ for port in RVL_PORTS:

##################################################################
RVW_PORTS = range(9060, 9061)
RVWEB = 'src/rvweb.py'
RVWEB = 'src/vFense_web.py'
for port in RVW_PORTS:
pid_file = '%sRVW_PID_%s.pid' % (PID_DIR, str(port))
rvw = 'RvWeb port %s' % (str(port))
Expand Down Expand Up @@ -92,12 +92,6 @@ if not os.path.exists('/opt/TopPatch/var/rethinkdb/'):
os.mkdir('/opt/TopPatch/var/rethinkdb/')
if not os.path.exists('/opt/TopPatch/var/log/'):
os.mkdir('/opt/TopPatch/var/log/')
if not os.path.exists('/opt/TopPatch/var/lib/'):
os.mkdir('/opt/TopPatch/var/lib/')
os.mkdir('/opt/TopPatch/var/lib/ssl')
os.mkdir('/opt/TopPatch/var/lib/ssl/client')
os.mkdir('/opt/TopPatch/var/lib/ssl/client/csr')
os.mkdir('/opt/TopPatch/var/lib/ssl/client/keys')

SERVICES.append((RVSCHEDULER, RVSCHEDULER_PIDFILE, 'RvScheduler'))
ALLSERVICES.append((RVSCHEDULER, RVSCHEDULER_PIDFILE, 'RvScheduler'))
Expand Down
Binary file removed tp/src/plugins/cve/__init__.pyc
Binary file not shown.
Binary file removed tp/src/plugins/cve/bulletin_parser.pyc
Binary file not shown.
Binary file removed tp/src/plugins/cve/cve_constants.pyc
Binary file not shown.
Binary file removed tp/src/plugins/cve/cve_db.pyc
Binary file not shown.
Binary file removed tp/src/plugins/cve/cve_parser.pyc
Binary file not shown.
Binary file removed tp/src/plugins/cve/downloader.pyc
Binary file not shown.
Binary file removed tp/src/plugins/cve/get_all_ubuntu_usns.pyc
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
REDIS_PID_FILE = '/opt/TopPatch/var/tmp/redis-6379.pid'
RETHINK_PID_FILE = '/opt/TopPatch/var/tmp/rethinkdb.pid'
TOPPATCH_HOME = '/opt/TopPatch/'

print 'FPPP'
parser = argparse.ArgumentParser(description='Initialize Rv Options')
parser.add_argument(
'--dnsname', dest='dns_name', default=None,
Expand Down Expand Up @@ -115,6 +115,8 @@ def initialize_db():
os.mkdir('/opt/TopPatch/tp/src/plugins/cve/data/xml', 0773)
if not os.path.exists('/opt/TopPatch/tp/src/plugins/cve/data/html/ubuntu'):
os.makedirs('/opt/TopPatch/tp/src/plugins/cve/data/html/ubuntu', 0773)
if not os.path.exists('/usr/lib/libpcre.so.1'):
os.symlink('/opt/TopPatch/lib/libpcre.so.1', '/usr/lib')

os.chdir(RETHINK_PATH)
rethink_init = subprocess.Popen(['./rethinkdb', 'create',
Expand Down
4 changes: 2 additions & 2 deletions tp/src/scripts/nginx_config_creator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NGINX_CONFIG_FILE = '/opt/TopPatch/conf/nginx/nginx-remediation_vault.conf'
NGINX_CONFIG_FILE = '/opt/TopPatch/conf/nginx/vFense.conf'
base_nginx_config = """server {
listen 80;
server_name %(server_name)s localhost;
Expand Down Expand Up @@ -94,7 +94,7 @@
}
location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
root /opt/toppatch-ui;
root /opt/TopPatch/tp/wwwstatic;
expires max;
add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
Expand Down
File renamed without changes.
5 changes: 0 additions & 5 deletions tp/src/rvweb.py → tp/src/vFense_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,11 @@
from server.api.groups_api import *
from server.api.customer_api import *
from server.api.permissions_api import *
##from server.api.toppatchretriever import *
from server.api.monit_api import *
from scripts.create_indexes import initialize_indexes_and_create_tables

from tornado.options import define, options

#import newrelic.agent
#newrelic.agent.initialize('/opt/TopPatch/conf/newrelic.ini')


define("port", default=9000, help="run on port", type=int)
define("debug", default=True, help="enable debugging features", type=bool)

Expand Down
2 changes: 0 additions & 2 deletions tp/wwwstatic/README.md

This file was deleted.

1 change: 0 additions & 1 deletion var/lib/redis/6379/dump.rdb

This file was deleted.

1 change: 0 additions & 1 deletion var/lib/ssl/client/csr/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions var/lib/ssl/client/keys/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions var/lib/ssl/client/keys/client.key

This file was deleted.

6 changes: 0 additions & 6 deletions var/lib/ssl/server/csr/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions var/lib/ssl/server/keys/.gitignore

This file was deleted.

22 changes: 0 additions & 22 deletions var/lib/ssl/server/keys/CA.cert

This file was deleted.

28 changes: 0 additions & 28 deletions var/lib/ssl/server/keys/CA.key

This file was deleted.

Loading

0 comments on commit 52aa87a

Please sign in to comment.