fix apache config & beautified travis.yml

.travis.yml

@@ -33,25 +33,25 @@ install:
   - if [ "${DB}" = "mysql" ]; then bundle install --without postgres; fi
   - if [ "${DB}" = "postgresql" ]; then bundle install; fi
 script:
-- bundle exec rubocop
-- rake db:create
-- rake db:migrate
-- rake db:seed
-- rake test:units
-- rake test:controllers
-- rake assets:precompile
-- rake db:drop
-- rake db:create
-- rake db:migrate
-- rake db:seed
-- ruby -I test/ test/integration/auto_wizard_test.rb
-- rake db:drop
-- rake db:create
-- rake db:migrate
-- rake db:seed
-- ruby -I test/ test/integration/geo_location_test.rb
-- ruby -I test/ test/integration/geo_calendar_test.rb
-- ruby -I test/ test/integration/user_agent_test.rb
-- ruby -I test/ test/integration/user_device_controller_test.rb
-- ruby -I test/ test/integration/sipgate_controller_test.rb
-- rake db:drop
+  - bundle exec rubocop
+  - rake db:create
+  - rake db:migrate
+  - rake db:seed
+  - rake test:units
+  - rake test:controllers
+  - rake assets:precompile
+  - rake db:drop
+  - rake db:create
+  - rake db:migrate
+  - rake db:seed
+  - ruby -I test/ test/integration/auto_wizard_test.rb
+  - rake db:drop
+  - rake db:create
+  - rake db:migrate
+  - rake db:seed
+  - ruby -I test/ test/integration/geo_location_test.rb
+  - ruby -I test/ test/integration/geo_calendar_test.rb
+  - ruby -I test/ test/integration/user_agent_test.rb
+  - ruby -I test/ test/integration/user_device_controller_test.rb
+  - ruby -I test/ test/integration/sipgate_controller_test.rb
+  - rake db:drop

contrib/apache2/zammad.conf

@@ -4,7 +4,7 @@
 
 <VirtualHost *:80>
     # replace 'localhost' with your fqdn if you want to use zammad from remote
-    ServerName ubuntu.local
+    ServerName localhost
 
     ## don't loose time with IP address lookups
     HostnameLookups Off