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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2014-03-09 14:53:20 +01:00
commit 11d0701298
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
db/migrate/20140128000001_add_search_index.rb
View file

@ -1,43 +1,38 @@
class AddSearchIndex < ActiveRecord::Migration class AddSearchIndex < ActiveRecord::Migration
def up def up
Setting.create_or_update( Setting.create_or_update(
:title => 'Elastic Search Endpoint URL', :title => 'Elasticsearch Endpoint URL',
:name => 'es_url', :name => 'es_url',
:area => 'SearchIndex::ElasticSearch', :area => 'SearchIndex::Elasticsearch',
:description => 'Define endpoint of Elastic Search.', :description => 'Define endpoint of Elastic Search.',
:state => '', :state => '',
:frontend => false :frontend => false
) )
Setting.create_or_update( Setting.create_or_update(
:title => 'Elastic Search Endpoint User', :title => 'Elasticsearch Endpoint User',
:name => 'es_user', :name => 'es_user',
:area => 'SearchIndex::ElasticSearch', :area => 'SearchIndex::Elasticsearch',
:description => 'Define http basic auth user of Elastic Search.', :description => 'Define http basic auth user of Elasticsearch.',
:state => '', :state => '',
:frontend => false :frontend => false
) )
Setting.create_or_update( Setting.create_or_update(
:title => 'Elastic Search Endpoint Password', :title => 'Elastic Search Endpoint Password',
:name => 'es_password', :name => 'es_password',
:area => 'SearchIndex::ElasticSearch', :area => 'SearchIndex::Elasticsearch',
:description => 'Define http basic auth password of Elastic Search.', :description => 'Define http basic auth password of Elasticsearch.',
:state => '', :state => '',
:frontend => false :frontend => false
) )
Setting.create_or_update( Setting.create_or_update(
:title => 'Elastic Search Endpoint Index', :title => 'Elastic Search Endpoint Index',
:name => 'es_index', :name => 'es_index',
:area => 'SearchIndex::ElasticSearch', :area => 'SearchIndex::Elasticsearch',
:description => 'Define Elastic Search index name.', :description => 'Define Elasticsearch index name.',
:state => 'zammad', :state => 'zammad',
:frontend => false :frontend => false
) )
# Setting.set('es_url', 'http://217.111.80.181')
# Setting.set('es_user', 'elasticsearch')
# Setting.set('es_password', 'zammad')
# Setting.set('es_index', Socket.gethostname + '_zammad')
Ticket.search_index_reload Ticket.search_index_reload
User.search_index_reload User.search_index_reload
Organization.search_index_reload Organization.search_index_reload