Fixed typo.

Conflicts:
	Gemfile
	README.md
	extras/zammad.spec

README.md

@@ -1,11 +1,11 @@
-[![Build Status](http://ci.zammad.org/buildStatus/icon?job=ZammadUnittest-ruby-2.0.0-p195)](http://ci.zammad.org/job/ZammadUnittest-ruby-2.0.0-p195/)
+[![Build Status develop](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop)](http://ci.zammad.org/job/Zammad%20Unittest%20Develop/) [![Build Status master](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Master)](http://ci.zammad.org/job/Zammad%20Unittest%20Master/)
 Welcome to Zammad
 =================
 
 Zammad is a web based open source helpdesk/ticket system with many features
 to manage customer telephone calls and e-mails. It is distributed under the
-GNU AFFERO General Public License (AGPL) and tested on Linux, Solaris, AIX,
-Windows, FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and
+GNU AFFERO General Public License (AGPL) and tested on Linux, Solaris, AIX, 
+FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and
 want to answer them with a team of agents? You're going to love Zammad!
 
 

README_Install_Ubuntu.md

@@ -75,8 +75,8 @@
 
 ### Get Zammad
 * cd /var/www/zammad
-* wget http://zammad.org/zammad-1.0.1.tar.gz
-* tar -xzf zammad-1.0.1.tar.gz
+* wget http://zammad.org/zammad-latest.tar.gz
+* tar -xzf zammad-latest.tar.gz
 
 ### Edit Gemfile
 * vi Gemfile

extras/zammad.spec

@@ -1,3 +1,51 @@
+%define user zammad
+%define group zammad
+%define basedir /opt/zammad
+
+Summary: A request tracking tool.
+Name: zammad
+Version: 0.4
+Release: 1%{?dist}.zammad
+Copyright: AGPL
+Group: Applications/Web
+Source: http://download.zammad.org/latest.tar.bz2
+URL: http://zammad.org/documentation
+Vendor: Zammad Foundation
+Packager: Roy Kaldung <roy@kaldung.com>
+Requires: nginx >= 1.4, libv8
+Requires(pre): shadow-utils
+Requires(post): chkconfig
+
+%description
+Zammad is a web based open source helpdesk/ticket system
+with many features to manage customer telephone calls and 
+e-mails. It is distributed under the GNU AFFERO General 
+Public License (AGPL) and tested on Linux, Solaris, AIX, 
+FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many 
+e-mails and want to answer them with a team of agents? 
+You're going to love Zammad!
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{basedir}
+mkdir -p $RPM_BUILD_ROOT/etc
+cd $RPM_BUILD_ROOT/etc
+ln -s $RPM_BUILD_ROOT%{basedir}/config etc/zammad
+
+%files
+%doc /opt/zammad/doc/README
+%doc /opt/zammad/doc/X-Headers.txt
+/opt/zammad/doc/app
+/opt/zammad/
+%config /opt/zammad/config
+
+
+%pre
+/usr/bin/getent group %{group} > /dev/null || /usr/sbin/groupadd -r %{group}
+/usr/bin/getent passwd %{user} > /dev/null || /usr/sbin/useradd -M -n -g %{group}-r -d /opt/zammad -s /sbin/nologin %{user}
+=======
 Name: zammad
 Version: 0.1
 Release: 1%{?dist}
@@ -175,7 +223,7 @@ pushd %{name}
         #rm ./log/test.log
         #mv ./log $RPM_BUILD_ROOT/%{logdir}
         ln -s %{logdir} ./log
-        
+
         #
         # Everything left goes in appdir
         #
@@ -207,4 +255,3 @@ rm -rf $RPM_BUILD_ROOT
 %{logrotatedir}/%{name}
 %doc
 
-

script/local_browser_tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 while true; do
-  read -p "Do you wish to drop database ane execute all browser tests?" yn
+  read -p "Do you wish to drop the database and execute all browser tests?" yn
   case $yn in
     [Yy]* ) echo "Start tests..."; break;;
     [Nn]* ) exit;;

script/websocket-server.rb

@@ -59,10 +59,9 @@ if ARGV[0] != 'start' && ARGV[0] != 'stop'
   exit;
 end
 
-puts "Starting websocket server on #{ @options[:b] }:#{ @options[:p] } (secure:#{ @options[:s].to_s },pid:#{@options[:i].to_s})"
-#puts options.inspect
-
 if ARGV[0] == 'stop'
+  puts "Stopping websocket server"
+
 
   # read pid
   pid =File.open( @options[:i].to_s  ).read
@@ -72,6 +71,7 @@ if ARGV[0] == 'stop'
   Process.kill( 9, pid.to_i )
   exit
 end
+puts "Starting websocket server on #{ @options[:b] }:#{ @options[:p] } (secure:#{ @options[:s].to_s },pid:#{@options[:i].to_s})"
 if ARGV[0] == 'start'  && @options[:d]
 
   Daemons.daemonize