Dradis Framework

Revision: 1928
          http://dradis.svn.sourceforge.net/dradis/?rev=1928&view=rev
Author:   etdsoft
Date:     2010-02-26 18:37:31 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
Improve the portability of the code. Now we can invoke the server script from
an external script (i.e. an init.d script) and Webrick will be able to find
the SSL cert and key files.

Modified Paths:
--------------
    server/trunk/vendor/rails/railties/lib/commands/server.rb

Modified: server/trunk/vendor/rails/railties/lib/commands/server.rb
===================================================================
--- server/trunk/vendor/rails/railties/lib/commands/server.rb	2010-02-18 20:25:56 UTC (rev 1927)
+++ server/trunk/vendor/rails/railties/lib/commands/server.rb	2010-02-26 18:37:31 UTC (rev 1928)
@@ -13,14 +13,17 @@
   # Thin not available
 end
 
+cert_file = File.join( File.dirname(__FILE__), '/../../../../../config/ssl/server.crt')
+key_file = File.join( File.dirname(__FILE__), '/../../../../../config/ssl/server.key.insecure')
+
 options = {
   :Port        => 3004,
   :Host        => "127.0.0.1",
   # Options for WEBrick SSL
   :SSLEnable => true,
   :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
-  :SSLCertificate => OpenSSL::X509::Certificate.new(File.open('config/ssl/server.crt').read),
-  :SSLPrivateKey => OpenSSL::PKey::RSA.new(File.open('config/ssl/server.key.insecure').read),
+  :SSLCertificate => OpenSSL::X509::Certificate.new(File.open( cert_file  ).read),
+  :SSLPrivateKey => OpenSSL::PKey::RSA.new(File.open( key_file ).read),
   :SSLCertName => [
     [ 'CN', 'dradis.' + WEBrick::Utils::getservername ]
     #[ 'O', 'dradis framework [dradis.sourceforge.net]'],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1927
          http://dradis.svn.sourceforge.net/dradis/?rev=1927&view=rev
Author:   etdsoft
Date:     2010-02-18 20:25:56 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
In some cases we do not have a num_ports entry in the Nessus XML file. Account
for this possibility in the code. More info:

http://dradisframework.org/community/index.php?topic=45.0

Modified Paths:
--------------
    server/trunk/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb

Modified: server/trunk/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb
===================================================================
--- server/trunk/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb	2010-02-05 13:56:24 UTC (rev 1926)
+++ server/trunk/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb	2010-02-18 20:25:56 UTC (rev 1927)
@@ -31,7 +31,12 @@
 		current_host.start_time	= host.elements['startTime'].text
 		current_host.stop_time	= host.elements['stopTime'].text
 		current_host.dns_name	= host.elements['dns_name'].text
-		current_host.open_ports	= host.elements['num_ports'].text
+    if host.elements['num_ports']
+  		current_host.open_ports	= host.elements['num_ports'].text
+    else
+  		current_host.open_ports	= 0
+    end
+    
 		current_host.mac_address = host.elements['mac_addr'].text
 		current_host.netbios_name = host.elements['netbios_name'].text
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1926
          http://dradis.svn.sourceforge.net/dradis/?rev=1926&view=rev
Author:   etdsoft
Date:     2010-02-05 13:56:24 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Create tag for release 2.5.0

Added Paths:
-----------
    installer/windows/tags/REL-2.5.0/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1925
          http://dradis.svn.sourceforge.net/dradis/?rev=1925&view=rev
Author:   etdsoft
Date:     2010-02-05 13:55:32 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Create release branch for release 2.5

Added Paths:
-----------
    installer/windows/branches/RB-2.5/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1907
          http://dradis.svn.sourceforge.net/dradis/?rev=1907&view=rev
Author:   etdsoft
Date:     2010-02-05 01:01:27 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
* Update the list of line numbers we need to change for each release:
** We are now installing to the $APPDATA\dradis-x.y insted of $APPDATA\dradis
** As a result of some of the changes we have made in the file, the line numbers have shifted around a bit

Modified Paths:
--------------
    HOWTO.installer

Modified: HOWTO.installer
===================================================================
--- HOWTO.installer	2010-02-05 00:55:12 UTC (rev 1906)
+++ HOWTO.installer	2010-02-05 01:01:27 UTC (rev 1907)
@@ -44,7 +44,8 @@
 - line 22 - !define PRODUCT_VERSION "x.y.z"
 - line 44 - !define MUI_WELCOMEPAGE_TEXT "This wizard wil guide you through the 
     installation of dradis version x.y.z
-- line 82 - OutFile "dradis-vx.y.x-setup.exe"
+- line 83 - OutFile "dradis-vx.y.x-setup.exe"
+- line 84 - installDir "$APPDATA\dradis-x.y"
 
 2.3 If the gem versions of wxruby or sqlite needs to be update then the version 
 numbers needs to be updated in the "wxruby" or "sqlite" sections. Also update 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1908
          http://dradis.svn.sourceforge.net/dradis/?rev=1908&view=rev
Author:   etdsoft
Date:     2010-02-05 01:24:31 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
* Remove the File line, it doesn't matter if the DB files are left in the server/ folder or the server/db/ folder
* Force (/r) the deletion of server/log
* If empty, delete attachments/ backups/ and eventually server/

Modified Paths:
--------------
    installer/windows/trunk/dradis-setup.nsi

Modified: installer/windows/trunk/dradis-setup.nsi
===================================================================
--- installer/windows/trunk/dradis-setup.nsi	2010-02-05 01:01:27 UTC (rev 1907)
+++ installer/windows/trunk/dradis-setup.nsi	2010-02-05 01:24:31 UTC (rev 1908)
@@ -81,7 +81,7 @@
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "dradis-v2.5-setup.exe"
-InstallDir "$APPDATA\dradis"
+InstallDir "$APPDATA\dradis-2.5"
 ShowInstDetails show
 ShowUnInstDetails show
 
@@ -404,10 +404,12 @@
 ;  Delete "$INSTDIR\start dradis meta-server.lnk"
   
   SetOutPath "$INSTDIR"
-  File "server\db\*"
   Delete "$INSTDIR\schema.rb"
   ;RMDir /r "$INSTDIR\client"
-  RMDir /r "$INSTDIR\server"
+  RMDir /r "$INSTDIR\server\log"
+  RMDir "$INSTDIR\server\attachments"
+  RMDir "$INSTDIR\server\backups"
+  RMDir "$INSTDIR\server"
   ;!include "client_uninstall.nsh"
   !include "server_uninstall.nsh"
 ;  !include "meta-server_uninstall.nsh"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1922
          http://dradis.svn.sourceforge.net/dradis/?rev=1922&view=rev
Author:   etdsoft
Date:     2010-02-05 11:35:19 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Create tag for release 2.5.0

Added Paths:
-----------
    meta/tags/REL-2.5.0/


Property changes on: meta/tags/REL-2.5.0
___________________________________________________________________
Added: svn:mergeinfo
   + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1921
          http://dradis.svn.sourceforge.net/dradis/?rev=1921&view=rev
Author:   etdsoft
Date:     2010-02-05 11:31:49 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Create release branch for release 2.5

Added Paths:
-----------
    meta/branches/RB-2.5/


Property changes on: meta/branches/RB-2.5
___________________________________________________________________
Added: svn:mergeinfo
   + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1910
          http://dradis.svn.sourceforge.net/dradis/?rev=1910&view=rev
Author:   etdsoft
Date:     2010-02-05 08:24:44 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Before working on any of the content folders, ensure we have svn updated to avoid commiting out of date files!

Modified Paths:
--------------
    HOWTO.release

Modified: HOWTO.release
===================================================================
--- HOWTO.release	2010-02-05 08:03:47 UTC (rev 1909)
+++ HOWTO.release	2010-02-05 08:24:44 UTC (rev 1910)
@@ -42,6 +42,7 @@
 are to be developed for the branch. Only bug fixes.
 
 $ cd server/
+$ svn update
 $ svn cp trunk/ branches/RB-X.Y
 $ svn commit -m 'Create release branch for release X.Y'
 
@@ -53,6 +54,7 @@
 1.2. client component (/client): create release branch and tags
 $ cd ..
 $ cd client/
+$ svn update
 $ svn cp trunk/ branches/RB-X.Y
 $ svn commit -m 'Create release branch for release X.Y'
 $ svn cp trunk/ tags/REL-X.Y.Z
@@ -60,14 +62,16 @@
 
 1.3 meta components (/meta)
 
+$ cd ..
+$ cd meta/
+$ svn update
+
 1.3.1 CHANGELOG: ensure that the CHANGELOG file in the meta/ folder contains 
 the latest additions from client/trunk/CHANGELOG and server/trunk/CHANGELOG
 
 1.3.2 Update the meta/trunk/RELEASE_NOTES for the current release.
 
 1.3.3 Prepare a branch and a tag for the current release:
-$ cd ..
-$ cd meta/
 $ svn cp trunk/ branches/RB-X.Y
 $ svn commit -m 'Create release branch for release X.Y'
 $ svn cp trunk/ tags/REL-X.Y.Z


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1919
          http://dradis.svn.sourceforge.net/dradis/?rev=1919&view=rev
Author:   etdsoft
Date:     2010-02-05 11:27:25 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Create tag for release 2.5.0

Added Paths:
-----------
    server/tags/REL-2.5.0/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1918
          http://dradis.svn.sourceforge.net/dradis/?rev=1918&view=rev
Author:   etdsoft
Date:     2010-02-05 11:05:40 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Create release branch for release 2.5

Added Paths:
-----------
    server/branches/RB-2.5/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1917
          http://dradis.svn.sourceforge.net/dradis/?rev=1917&view=rev
Author:   etdsoft
Date:     2010-02-05 09:17:55 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Reference the RELEASE_NOTES document

Modified Paths:
--------------
    meta/trunk/readme.txt

Modified: meta/trunk/readme.txt
===================================================================
--- meta/trunk/readme.txt	2010-02-05 09:02:02 UTC (rev 1916)
+++ meta/trunk/readme.txt	2010-02-05 09:17:55 UTC (rev 1917)
@@ -14,7 +14,10 @@
 
     http://dradisframework.org/community/
 
+Relese notes can be found in the RELEASE_NOTES document
 
+Installation Notes
+------------------
 The dradis installation gives the users the option to install the following
 components:
  - Ruby


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1916
          http://dradis.svn.sourceforge.net/dradis/?rev=1916&view=rev
Author:   etdsoft
Date:     2010-02-05 09:02:02 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Update the release CHANGELOG with items from the server CHANGELOG

Modified Paths:
--------------
    meta/trunk/CHANGELOG

Modified: meta/trunk/CHANGELOG
===================================================================
--- meta/trunk/CHANGELOG	2010-02-05 09:00:09 UTC (rev 1915)
+++ meta/trunk/CHANGELOG	2010-02-05 09:02:02 UTC (rev 1916)
@@ -1,3 +1,17 @@
+v2.5 (5th of February 2010)
+ - improved Note editor (supports formatting)
+ - new HTML export plugin to generate reports in HTML format
+ - new Nikto Upload plugin: your favourite web server scanner output in Dradis.
+ - new Burp Upload plugin: you can now import your Burp Scanner results.
+ - improved 'First Time User Wizard' introduction
+ - keep track of all the activity with the built-in RSS feed
+ - new Rake task: dradis:backup
+ - Rake dradis:reset now creates a backup of the project by default
+ - Rake dradis:reset now clears the old log files
+ - the Nmap Upload plugin organizes the nodes in a more structured way
+ - upgraded libraries: ExtJS 3.0, Rails 2.3.5
+ - bugs fixed: #2936554, #2938593
+
 v2.4.1 (31st of October 2009)
  - server bugs fixed: #2881746, #2888245, #2889402
  - client bugs fixed: #2888411


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1915
          http://dradis.svn.sourceforge.net/dradis/?rev=1915&view=rev
Author:   etdsoft
Date:     2010-02-05 09:00:09 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Update the release notes for 2.5

Modified Paths:
--------------
    meta/trunk/RELEASE_NOTES

Modified: meta/trunk/RELEASE_NOTES
===================================================================
--- meta/trunk/RELEASE_NOTES	2010-02-05 08:55:58 UTC (rev 1914)
+++ meta/trunk/RELEASE_NOTES	2010-02-05 09:00:09 UTC (rev 1915)
@@ -1,59 +1,58 @@
- Dradis Framework 2.4.1 - Release Notes
+ Dradis Framework 2.5 - Release Notes
 =====================================
- -- version 2.4.1, October 31st, 2009 --
+ -- version 2.5, February 5th, 2010 --
   -- http://dradisframework.org --
 
 What is new
 -----------
 We are happy to announce that the following new features have made
-it into the version 2.4:
+it into the version 2.5:
 
-1. -- Plugin feedback
-We all have suffered the 'waiting forever' sindrom whenever something went
-wrong while using the Upload plugins. We have improved the feedback mechanism
-so you will be get useful information about the Upload process.
+1. -- New First Time User Wizard 
+It explains the handful of contcepts every Dradis newcomer needs to ba aware of:
+  * Users and Paswords
+  * Interface elements description
+  * Plugins: types and examples
+  * How to make your notes ready for reporting
+  * Where to get help
 
 2. -- Plugin updates
-We are now using the Nmap::Parser (http://rubynmap.sourceforge.net/) library in
-the Nmap Upload plugin.
+There are a few new plugins:
+  * HTML Export: the first release of this new HTML reporting module.
+  * Nikto Upload: to import the results from your favourite web server scanner.
+  * Burp Upload: to use Burp Scanner XML output files
 
-A new plugin to query the Open Source Vulnerability Database (OSVDB) has been
-added to the set of core plugins deployed with the framework.
+We have updated the Nmap Upload plugin to better organize it's output.
 
 3. -- Interface enhancements --
-We have added a few elements to the web interface to make the small every day
-tasks a bit easier:
-  ~ drag'n'drop for notes (so they can be moved across the nodes tree.
-  ~ a new *feedback* link has been added to the top-right corner to encourage
-    on-the-fly feedback from users finding bugs or requesting features while
-    using Dradis.
+Some major works have been undertajen on the interface. A brand new 
+email-client layout has been adopted. Dradis now has a Note Preview panel for
+better accessibility to lengthy notes.
 
-4. -- Windows installer / Dependencies verification script
-Smarter and sexier, the new Windows installer makes use of the official Dradis
-icons, and takes even less time to complete the process.
+There is also a new Note Editor, bigger, simpler and easier to use. And we 
+support Textile markup! [i]
 
-On the Linux front, verify.sh is a shell script that will point you what 
-dependencies you need to install in order to get Dradis up and running.
+And finally an RSS feed, so you can get in a glance an idea of what the 
+evolution of the repository has been.
 
+
 Bugs Fixed
 ----------
-#2881746.- Nessus import multiple instance of each issue
-#2888245.- Exception when an attachment did not have extension
-#2889402.- WordExport debug code
+#2936554 - Attachment filename URL encoding 
+#2938593 - Nmap wrong port state reported
 
 Known Issues
 ------------
-Dradis requires Rake 0.8.7 or later. Please upgrade your Rake installation:
-$ gem install rake
 
+
 Installing
 ----------
 As always the release ships with a windows installer,
-dradis-v2.4.1-setup.exe, and the platform independent packages,
-dradis-v2.4.1.tar.bz2 and dradis-v2.4.1.tar.gz. This can all be
-downloaded from the website [i]. 
+dradis-v2.5.0-setup.exe, and the platform independent packages,
+dradis-v2.5.0.tar.bz2 and dradis-v2.5.0.tar.gz. This can all be
+downloaded from the website [ii]. 
 
-For Linux prerequisite instructions please see [ii].
+For Linux prerequisite instructions please see [iii].
 
 
 Getting involved
@@ -65,5 +64,7 @@
 dradis development mailing list:
   https://lists.sourceforge.net/mailman/listinfo/dradis-devel 
 
-  [i] - http://dradisframework.org
- [ii] - http://dradisframework.org/install.html
+  [i] - http://redcloth.org/
+ [ii] - http://dradisframework.org
+[iii] - http://dradisframework.org/install.html
+[iii] - http://redcloth.org/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1914
          http://dradis.svn.sourceforge.net/dradis/?rev=1914&view=rev
Author:   etdsoft
Date:     2010-02-05 08:55:58 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Ensure we are HTML encoding the Feed item text before displaying it

Modified Paths:
--------------
    server/trunk/public/javascripts/dx/dradis.feeds.FeedsWindow.js

Modified: server/trunk/public/javascripts/dx/dradis.feeds.FeedsWindow.js
===================================================================
--- server/trunk/public/javascripts/dx/dradis.feeds.FeedsWindow.js	2010-02-05 08:43:14 UTC (rev 1913)
+++ server/trunk/public/javascripts/dx/dradis.feeds.FeedsWindow.js	2010-02-05 08:55:58 UTC (rev 1914)
@@ -5,7 +5,7 @@
 dradis.feeds.DataView=Ext.extend(Ext.DataView, {
     tpl:  new Ext.XTemplate(
       '<tpl for=".">',
-          '<div class="topic"><b>{title}</b><span class="author">{stamp}</span><div class="description">{value}</div></div>',
+          '<div class="topic"><b>{title}</b><span class="author">{stamp}</span><div class="description">{value:htmlEncode}</div></div>',
       '</tpl>',
       '<div class="x-clear"></div>'
     ),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1911
          http://dradis.svn.sourceforge.net/dradis/?rev=1911&view=rev
Author:   etdsoft
Date:     2010-02-05 08:28:31 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Adjust the date, we are releasing!

Modified Paths:
--------------
    server/trunk/CHANGELOG

Modified: server/trunk/CHANGELOG
===================================================================
--- server/trunk/CHANGELOG	2010-02-05 08:24:44 UTC (rev 1910)
+++ server/trunk/CHANGELOG	2010-02-05 08:28:31 UTC (rev 1911)
@@ -1,9 +1,9 @@
 v2.x (xx of xxx 2010)
 
-v2.5 (4th of February 2010)
+v2.5 (5th of February 2010)
  - improved Note editor (supports formatting)
  - new HTML export plugin to generate reports in HTML format
- - improved 'First Time' introduction
+ - improved 'First Time Wizard' introduction
  - keep track of all the activity with the built-in RSS feed
  - new Rake task: dradis:backup
  - Rake dradis:reset now creates a backup of the project by default


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1912
          http://dradis.svn.sourceforge.net/dradis/?rev=1912&view=rev
Author:   etdsoft
Date:     2010-02-05 08:42:33 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
We were missing the Nikto and Burp plugins.

Modified Paths:
--------------
    server/trunk/app/views/home/_first_render.rhtml

Modified: server/trunk/app/views/home/_first_render.rhtml
===================================================================
--- server/trunk/app/views/home/_first_render.rhtml	2010-02-05 08:28:31 UTC (rev 1911)
+++ server/trunk/app/views/home/_first_render.rhtml	2010-02-05 08:42:33 UTC (rev 1912)
@@ -29,6 +29,8 @@
       <div class="feature">Plugins</div>
       <ul>
         <li>The <strong>HTML Export</strong> plugin.</li>
+        <li>New <strong>Nikto Upload plugin</strong>.</li>
+        <li>New <strong>Burp Upload plugin</strong>.</li>
         <li>Improved structure of the information generated by the <strong>Nmap Upload</strong> plugin.</li>
       </ul>
     </li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1909
          http://dradis.svn.sourceforge.net/dradis/?rev=1909&view=rev
Author:   etdsoft
Date:     2010-02-05 08:03:47 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
There is no need to advise users to change the client config file if we are no loger distributting the client with the main package

Modified Paths:
--------------
    server/trunk/app/controllers/sessions_controller.rb

Modified: server/trunk/app/controllers/sessions_controller.rb
===================================================================
--- server/trunk/app/controllers/sessions_controller.rb	2010-02-05 01:24:31 UTC (rev 1908)
+++ server/trunk/app/controllers/sessions_controller.rb	2010-02-05 08:03:47 UTC (rev 1909)
@@ -89,7 +89,7 @@
       Configuration.create( :name => 'project', :value => @project_revision.prefix_options[:project_id].to_s )
     end
 
-    flash[:notice] =  'Password set. Please log in.<br/> Remember to adjust the client configuration file (client/conf/dradis.xml).'
+    flash[:notice] =  'Password set. Please log in.'
     redirect_to :action => :new
   end
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1905
          http://dradis.svn.sourceforge.net/dradis/?rev=1905&view=rev
Author:   etdsoft
Date:     2010-02-05 00:49:25 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
New reset.bat script that invokes Rake and executes the dradis:reset action

Added Paths:
-----------
    installer/windows/trunk/misc/reset.bat

Added: installer/windows/trunk/misc/reset.bat
===================================================================
--- installer/windows/trunk/misc/reset.bat	                        (rev 0)
+++ installer/windows/trunk/misc/reset.bat	2010-02-05 00:49:25 UTC (rev 1905)
@@ -0,0 +1,4 @@
+@echo off
+set PATH=c:\Ruby\bin;%PATH%
+cd server
+"c:\Ruby\bin\rake.bat" -f Rakefile dradis:reset


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1904
          http://dradis.svn.sourceforge.net/dradis/?rev=1904&view=rev
Author:   etdsoft
Date:     2010-02-04 23:58:09 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
db:drop was giving problems with the new ruby in windows causing a strange
access control error. My manually doing the drop/migrate/seed operations
we prevent it.

Modified Paths:
--------------
    server/trunk/lib/tasks/dradis.rake

Modified: server/trunk/lib/tasks/dradis.rake
===================================================================
--- server/trunk/lib/tasks/dradis.rake	2010-02-04 20:00:23 UTC (rev 1903)
+++ server/trunk/lib/tasks/dradis.rake	2010-02-04 23:58:09 UTC (rev 1904)
@@ -44,7 +44,15 @@
   end
 
   desc 'Creates a backup. Drops the database, removes the attachments and recreates the DB.'
-  task :reset => ['backup', 'db:drop', 'db:migrate', 'db:seed', 'dradis:attachments:drop', 'log:clear'] do
+  task :reset => ['backup', 'dradis:attachments:drop', 'log:clear'] do
+    # reinit the database
+    if (ActiveRecord::Migrator::current_version > 0)
+      ActiveRecord::Migrator.migrate("db/migrate/", 0)
+    end
+    ActiveRecord::Migrator.migrate("db/migrate/", nil)
+    Rake::Task["db:seed"].invoke
+
+    # init the config files
     init_all = false
     Dir['config/*.template'].each do |template|
       config = File.join( 'config', File.basename(template, '.template') )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.