Merge pull request #379 from cjp/master

Removed references to snorby.org.

README.md

@@ -1,6 +1,5 @@
 # Snorby
 
-* [snorby.org](http://www.snorby.org)
 * [github.com/Snorby/snorby](http://github.com/Snorby/snorby/)
 * [github.com/Snorby/snorby/issues](http://github.com/Snorby/snorby/issues)
 * [github.com/Snorby/snorby/wiki](http://github.com/Snorby/snorby/wiki)
@@ -10,16 +9,6 @@
 
 Snorby is a ruby on rails web application for network security monitoring that interfaces with current popular intrusion detection systems (Snort, Suricata and Sagan). The basic fundamental concepts behind Snorby are **simplicity**, organization and power. The project goal is to create a free, open source and highly competitive application for network monitoring for both private and enterprise use.
 
-## Demo
-
-URL: [http://demo.snorby.org](http://demo.snorby.org)
-
-User: demo@snorby.org
-
-Pass: snorby
-
-**NOTE** For the full packet capture HTTP basic AUTH use the same credentials.
-
 ## Requirements
 
 * Snort
@@ -69,7 +58,7 @@ Pass: snorby
 
 * Default User Credentials
 
-	* E-mail: **snorby@snorby.org**
+	* E-mail: **snorby@example.com**
 	* Password: **snorby**
 
 * NOTE - If you do not run Snorby with passenger (http://www.modrails.com) people remember to start rails in production mode.

app/mailers/event_mailer.rb

@@ -6,7 +6,7 @@ def event_information(event, emails, subject, note, user)
     @emails = emails.split(',')
     @note = note
 
-    @from = (Setting.email? ? Setting.find(:email) : "snorby@snorby.org")
+    @from = (Setting.email? ? Setting.find(:email) : "snorby@example.com")
 
     mail(:to => @emails, :from => @from, :subject => "[Snorby Event] #{subject}")
   end

app/mailers/note_mailer.rb

@@ -9,7 +9,7 @@ def new_note(note)
       @emails << "#{user.name} <#{user.email}>" if user.accepts_note_notifications?(@event)
     end
 
-    @from = (Setting.email? ? Setting.find(:email) : "snorby@snorby.org")
+    @from = (Setting.email? ? Setting.find(:email) : "snorby@example.com")
 
     mail(:to => @emails, :from => @from, :subject => "[Snorby] New Event Note Added")
   end

app/mailers/report_mailer.rb

@@ -9,7 +9,7 @@ def daily_report(email, timezone="UTC")
     # end
 
     mail(:to => email,
-         :from => (Setting.email? ? Setting.find(:email) : "snorby@snorby.org"),
+         :from => (Setting.email? ? Setting.find(:email) : "snorby@example.com"),
          :subject => "Snorby Daily Report: #{report[:start_time].strftime('%A, %B %d, %Y')}")
   end
 
@@ -22,15 +22,15 @@ def weekly_report(email, timezone="UTC")
     # end
 
     mail(:to => email, 
-         :from => (Setting.email? ? Setting.find(:email) : "snorby@snorby.org"), 
+         :from => (Setting.email? ? Setting.find(:email) : "snorby@example.com"), 
          :subject => "Snorby Weekly Report: #{report[:start_time].strftime('%A, %B %d, %Y %I:%M %p')} - #{report[:end_time].strftime('%A, %B %d, %Y %I:%M %p')}")
   end
 
   def monthly_report(email, timezone="UTC")
     report = Snorby::Report.build_report('last_month', timezone)
     attachments["snorby-monthly-report.pdf"] = report[:pdf]
     mail(:to => email, 
-         :from => (Setting.email? ? Setting.find(:email) : "snorby@snorby.org"), 
+         :from => (Setting.email? ? Setting.find(:email) : "snorby@example.com"), 
          :subject => "Snorby Monthly Report: #{report[:start_time].strftime('%A, %B %d, %Y %I:%M %p')} - #{report[:end_time].strftime('%A, %B %d, %Y %I:%M %p')}")
   end
 
@@ -39,7 +39,7 @@ def update_report(email, data, timezone="UTC")
     total_event_count = data.map(&:event_count).sum
     p @data
     mail(:to => email,
-      :from => (Setting.email? ? Setting.find(:email) : "snorby@snorby.org"),
+      :from => (Setting.email? ? Setting.find(:email) : "snorby@example.com"),
       :subject => "Snorby Event Report [Count: #{total_event_count}] #{@data.first.ran_at.strftime('%D %H:%M:%S %Z')} - #{(@data.first.ran_at + 30.minutes).strftime('%D %H:%M:%S %Z')}")
   end
 

app/views/events/create_email.html.erb

@@ -18,15 +18,15 @@
         <div class="clear"></div>
 
 				<p>
-					<%= label_tag 'Recipients:' %> <i>(separate email addresses by comma. Example: demo@snorby.org, example@example.com)</i><br />
+					<%= label_tag 'Recipients:' %> <i>(separate email addresses by comma. Example: demo@example.com, example@example.com)</i><br />
 					<br />
 
 					<div class='grid_4 alpha' style='padding-top:7px;'>
 						<%= select_tag 'ignore', dropdown_select_tag(User.all, :email, false, ['<option value=''>Please Select A User</option>']), :class => 'email-user-select' %><br />
 					</div>
 
 					<div class='grid_10' style='margin-bottom:7px;'>
-						<%= text_field_tag 'email[to]', nil, :class => 'input-small required', :style => 'width:475px;', :placeholder => 'demo@snorby.org, example@example.com' %><br />
+						<%= text_field_tag 'email[to]', nil, :class => 'input-small required', :style => 'width:475px;', :placeholder => 'demo@example.com, example@example.com' %><br />
 					</div>
 
 				</p>

app/views/layouts/_footer.html.erb

@@ -1,7 +1,7 @@
 <div id="footer" class='container_12'>
 	<div id="footer-inside" class='round'>
     Snorby <%= Snorby::VERSION %> - 
-    <%= link_to 'https://www.snorby.org', 'https://www.snorby.org' %> 
+    <%= link_to 'https://github.com/Snorby/snorby', 'https://github.com/Snorby/snorby' %> 
     &copy; <%= Time.now.year %> 
     <a href="https://threatstack.com">Threat Stack, Inc</a> - 
     Created By: Dustin Willis Webber

app/views/layouts/_version.html.erb

@@ -1 +1 @@
-<!-- Snorby - Version: <%= Snorby::VERSION %> - http://www.snorby.org -->
+<!-- Snorby - Version: <%= Snorby::VERSION %> - https://github.com/Snorby/snorby -->

app/views/layouts/application.html.erb

@@ -86,24 +86,6 @@
     <%= render :partial => 'layouts/notify' %>
 
     <script type="text/javascript" charset="utf-8">
-      <% if Setting.update_notifications? %>
-        if (!$.cookie('snorby-ignore-update')) {
-          $.ajax({
-            url: 'https://www.snorby.org/version?current_version=<%= Snorby::VERSION%>',
-            dataType: "jsonp",
-            global: false,
-            crossDomain: true,
-            success: function(data) {
-              if (data && (typeof data === "object")) {
-                if (data.version !== "<%= Snorby::VERSION %>") {
-                  $('#header-top').append(Snorby.templates.update_notifications(data));
-                };
-              };
-            }
-          });
-        };
-      <% end %>
-
       <% if Setting.event_notifications? %>
         monitor_events(false);
       <% else %>

app/views/layouts/login.html.erb

@@ -31,7 +31,7 @@
       <div class="login-footer">
       &copy; <%= Time.now.year %> <a href="https://threatstack.com">Threat Stack, Inc</a> - Created By: Dustin Willis Webber
       <br /><br /> 
-        Snorby <%= Snorby::VERSION %> - <%= link_to 'https://www.snorby.org', 'https://www.snorby.org' %> 
+        Snorby <%= Snorby::VERSION %> - <%= link_to 'https://github.com/Snorby/snorby', 'https://github.com/Snorby/snorby' %> 
       </div>
     </div>
     <%- flash.each do |type, message| -%>

app/views/settings/index.html.erb

@@ -29,7 +29,7 @@
 
 			<p>
 				<%= check_box_tag '[settings][update_notifications]', 0, (Setting.update_notifications ? Setting.find(:update_notifications) : nil) %> <%= label_tag 'Enable Snorby Update Notifications' %><br />
-        <i>(Notification reminder when a new Snorby build is release using http://snorby.org/version)</i>
+        <i>(DEPRECATED Notification reminder when a new Snorby build is release using http://snorby.org/version)</i>
 			</p>
 
 			<p class='_settings_packet_capture'>

app/views/users/new.html.erb

@@ -20,7 +20,7 @@
               <%= f.text_field :name, :placeholder => 'Full Name', :class => 'required' %></p>
             <% end %>
 
-            <p><%= f.label :email %> <em>(example: snorby@snorby.org)</em><br />
+            <p><%= f.label :email %> <em>(example: snorby@example.com)</em><br />
             <%= f.text_field :email, :placeholder => 'E-mail Address', :class => 'required email' %></p>
 
             <% if Snorby::CONFIG[:authentication_mode] == "database" %>

app/views/users/registrations/edit.html.erb

@@ -17,7 +17,7 @@
   			  <%= f.text_field :name, :placeholder => 'Full Name', :class => 'required' %></p>
         <% end %>
 
-			  <p><%= f.label :email %> <em>(example: snorby@snorby.org)</em><br />
+			  <p><%= f.label :email %> <em>(example: snorby@example.com)</em><br />
 			  <%= f.text_field :email, :placeholder => 'E-mail Address', :class => 'required email' %></p>
 
         <% if Snorby::CONFIG[:authentication_mode] == "database"  %>

config/initializers/mail_config.example.rb

@@ -7,7 +7,7 @@
 # ActionMailer::Base.smtp_settings = {
 #   :address              => "smtp.gmail.com",
 #   :port                 => 587,
-#   :domain               => "snorby.org",
+#   :domain               => "example.com",
 #   :user_name            => "snorby",
 #   :password             => "snorby",
 #   :authentication       => "plain",

config/initializers/mail_config.rb

@@ -7,7 +7,7 @@
 # ActionMailer::Base.smtp_settings = {
 #   :address              => "smtp.gmail.com",
 #   :port                 => 587,
-#   :domain               => "snorby.org",
+#   :domain               => "example.com",
 #   :user_name            => "snorby",
 #   :password             => "snorby",
 #   :authentication       => "plain",

config/snorby_config.yml.example

@@ -9,10 +9,10 @@ production:
   # in case you want to run snorby under a suburi/suburl under eg. passenger:
   baseuri: ''
   # baseuri: '/snorby'
-  domain: 'demo.snorby.org'
+  domain: 'demo.example.com'
   wkhtmltopdf: /usr/local/bin/wkhtmltopdf
   ssl: false
-  mailer_sender: 'snorby@snorby.org'
+  mailer_sender: 'snorby@example.com'
   geoip_uri: "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"
   rules:
     - ""
@@ -32,7 +32,7 @@ development:
   domain: localhost:3000
   wkhtmltopdf: /Users/mephux/.rvm/gems/ruby-1.9.2-p0/bin/wkhtmltopdf
   ssl: false
-  mailer_sender: 'snorby@snorby.org'
+  mailer_sender: 'snorby@example.com'
   geoip_uri: "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"
   rules: 
     - "/Users/mephux/.snort/rules"
@@ -53,6 +53,6 @@ test:
   baseuri: ''
   domain: localhost:3000
   wkhtmltopdf: /usr/local/bin/wkhtmltopdf
-  mailer_sender: 'snorby@snorby.org'
+  mailer_sender: 'snorby@example.com'
   geoip_uri: "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"
   authentication_mode: database

db/seeds.rb

@@ -2,11 +2,11 @@
 SnortSchema.create(:vseq => 107, :ctime => Time.now, :version => "Snorby #{Snorby::VERSION}") if SnortSchema.first.blank?
 
 # Default user setup
-User.create(:name => 'Administrator', :email => 'snorby@snorby.org', :password => 'snorby', :password_confirmation => 'snorby', :admin => true) if User.all.blank?
+User.create(:name => 'Administrator', :email => 'snorby@example.com', :password => 'snorby', :password_confirmation => 'snorby', :admin => true) if User.all.blank?
 
 # Snorby General Settings
 Setting.set(:company, 'Snorby.org') unless Setting.company?
-Setting.set(:email, 'snorby@snorby.org') unless Setting.email?
+Setting.set(:email, 'snorby@example.com') unless Setting.email?
 Setting.set(:signature_lookup, 'http://rootedyour.com/snortsid?sid=$$gid$$:$$sid$$') unless Setting.signature_lookup?
 Setting.set(:daily, 1) unless Setting.daily?
 Setting.set(:weekly, 1) unless Setting.weekly?