Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix apache config & beautified travis.yml

Browse source
This commit is contained in:
André Bauer 2016-12-04 12:48:58 +01:00
parent bc54d0542d
commit 4df2325669
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
.travis.yml
View file

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

2
contrib/apache2/zammad.conf
View file

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