[kateglo] r488 committed - Making Puppet configurable

6 views

Skip to first unread message

kat...@googlecode.com

unread,

Jul 27, 2012, 8:45:10 AM7/27/12

to kat...@googlegroups.com

Revision: 488
Author: arthur.purnama
Date: Fri Jul 27 05:44:43 2012
Log: Making Puppet configurable
http://code.google.com/p/kateglo/source/detail?r=488

Added:
/branches/kateglox/vagrant/puppet/modules/kateglo/templates

/branches/kateglox/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb

/branches/kateglox/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb
Deleted:
/branches/kateglox/vagrant/puppet/modules/kateglo/files/data-config.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/files/solrconfig.xml
Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/manifests/main.pp
/branches/kateglox/vagrant/puppet/modules/bootstrap/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/diverse/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/mysql/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/solr/templates/default.jetty.erb

=======================================
--- /dev/null
+++
/branches/kateglox/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb
Fri Jul 27 05:44:43 2012
@@ -0,0 +1,160 @@
+<dataConfig>
+ <dataSource type="JdbcDataSource" driver="com.mysql.jdbc.Driver"
url="jdbc:mysql://127.0.0.1/kateglox" user="<%= solrDBUser %>"
+ password="<%= solrDBPassword %>"/>
+ <document name="entries">
+ <entity name="entry" query="select * from entry">
+
+ <field column="entry_id" name="id"/>
+ <field column="entry_name" name="entri"/>
+
+ <entity name="meaning" query="select * from meaning where
meaning_entry_id='${entry.entry_id}'">
+
+ <entity name="antonym" query="select * from antonym where
antonym_meaning_id='${meaning.meaning_id}'">
+ <entity name="antonym_meaning"
+ query="select * from meaning where
meaning_id='${antonym.antonym_antonym_id}'">
+ <entity name="antonym_meaning_entry"
+ query="select * from entry where
entry_id='${antonym_meaning.meaning_entry_id}'">
+ <field column="entry_name" name="antonim"/>
+ </entity>
+ </entity>
+ </entity>
+
+ <entity name="definition"
+ query="select * from definition where
definition_meaning_id='${meaning.meaning_id}'">
+ <field column="definition_text" name="definisi"/>
+
+ <entity name="definition_class"
+ query="select * from rel_definition_class
where rel_definition_id='${definition.definition_id}'">
+ <entity name="class"
+ query="select * from class where
class_id='${definition_class.rel_class_id}'">
+ <field column="class_name" name="kelas"/>
+
+ <entity name="rel_class_category"
+ query="select * from
rel_class_category where rel_class_id='${class.class_id}'">
+ <entity name="class_category"
+ query="select * from
class_category where
class_category_id='${rel_class_category.rel_class_category_id}'">
+ <field column="class_category_name"
name="kategoriKelas"/>
+ </entity>
+ </entity>
+ </entity>
+ </entity>
+
+ <entity name="definition_discipline"
+ query="select * from rel_definition_discipline
where rel_definition_id='${definition.definition_id}'">
+ <entity name="definition" query="select * from
discipline where
discipline_id='${definition_discipline.rel_discipline_id}'">
+ <field column="discipline_name"
name="disiplin" />
+ </entity>
+ </entity>
+
+ <entity name="sample"
+ query="select * from sample where
sample_definition_id='${definition.definition_id}'">
+ <field column="sample_text" name="contoh"/>
+ </entity>
+
+ </entity>
+
+ <entity name="misspelled"
+ query="select * from misspelled where
misspelled_meaning_id='${meaning.meaning_id}'">
+ <entity name="misspelled_meaning"
+ query="select * from meaning where
meaning_id='${misspelled.misspelled_misspelled_id}'">
+ <entity name="misspelled_meaning_entry"
+ query="select * from entry where
entry_id='${misspelled_meaning.meaning_entry_id}'">
+ <field column="entry_name" name="salahEja"/>
+ </entity>
+ </entity>
+ </entity>
+
+ <entity name="relation"
+ query="select * from relation where
relation_meaning_id='${meaning.meaning_id}'">
+ <entity name="relation_meaning"
+ query="select * from meaning where
meaning_id='${relation.relation_relation_id}'">
+ <entity name="relation_meaning_entry"
+ query="select * from entry where
entry_id='${relation_meaning.meaning_entry_id}'">
+ <field column="entry_name" name="relasi"/>
+ </entity>
+ </entity>
+ </entity>
+
+ <entity name="synonym" query="select * from synonym where
synonym_meaning_id='${meaning.meaning_id}'">
+ <entity name="synonym_meaning"
+ query="select * from meaning where
meaning_id='${synonym.synonym_synonym_id}'">
+ <entity name="synonym_meaning_entry"
+ query="select * from entry where
entry_id='${synonym_meaning.meaning_entry_id}'">
+ <field column="entry_name" name="sinonim"/>
+ </entity>
+ </entity>
+ </entity>
+
+ <entity name="spelled"
+ query="select * from misspelled where
misspelled_misspelled_id='${meaning.meaning_id}'">
+ <entity name="spelled_meaning"
+ query="select * from meaning where
meaning_id='${spelled.misspelled_meaning_id}'">
+ <entity name="spelled_meaning_entry"
+ query="select * from entry where
entry_id='${spelled_meaning.meaning_entry_id}'">
+ <field column="entry_name" name="ejaan"/>
+ </entity>
+ </entity>
+ </entity>
+
+ <entity name="syllabel"
+ query="select * from syllabel where
syllabel_meaning_id='${meaning.meaning_id}'">
+ <field column="syllabel_text" name="silabel"/>
+ </entity>
+
+ <entity name="meaning_type"
+ query="select * from rel_meaning_type where
rel_meaning_id='${meaning.meaning_id}'">
+ <entity name="type" query="select * from type where
type_id='${meaning_type.rel_type_id}'">
+ <field column="type_name" name="bentuk"/>
+
+ <entity name="rel_type_category"
+ query="select * from rel_type_category
where rel_type_id='${type.type_id}'">
+ <entity name="type_category"
+ query="select * from type_category
where type_category_id='${rel_type_category.rel_type_category_id}'">
+ <field column="type_category_name"
name="kategoriBentuk"/>
+ </entity>
+ </entity>
+ </entity>
+ </entity>
+
+ </entity>
+
+ <entity name="source" query="select * from source where
source_entry_id='${entry.entry_id}'">
+ <field column="source_text_clean" name="sumber"/>
+
+ <entity name="source_category"
+ query="select * from source_category where
source_category_id = '${source.source_category_id}'">
+ <field column="source_category_name"
name="kategoriSumber"/>
+ </entity>
+ </entity>
+
+ <entity name="equivalents" query="select * from equivalent
where equivalent_entry_id='${entry.entry_id}'">
+ <entity name="foreign"
+ query="select * from `foreign` where foreign_id
= '${equivalents.equivalent_foreign_id}'">
+ <field column="foreign_name" name="asing"/>
+
+ <entity name="language"
+ query="select * from language where
language_id='${foreign.foreign_language_id}'">
+ <field column="language_name" name="bahasa"/>
+
+ <entity name="rel_equivalent_discipline"
+ query="select * from
rel_equivalent_discipline where
rel_equivalent_id='${equivalents.equivalent_id}'">
+ <entity name="equivalent_discipline"
+ query="select * from discipline where
discipline_id='${rel_equivalent_discipline.rel_discipline_id}'">
+ <field column="discipline_name"
name="disiplinPadanan"/>
+ </entity>
+
+ </entity>
+
+ </entity>
+
+
+ </entity>
+ <entity name="equivalent"
+ query="select
CONCAT('{"foreign":"',foreign_name,'","language":"',language_name,'","discipline":[',disciplines,']}')
as equivalents from (select foreign_name, language_name, CASE WHEN
GROUP_CONCAT(discipline_name) is null THEN '' ELSE CONCAT('"',
GROUP_CONCAT(discipline_name SEPARATOR '","'), '"') END as
disciplines from equivalent LEFT JOIN `foreign` ON foreign_id =
equivalent_foreign_id LEFT JOIN language ON language_id =
foreign_language_id LEFT JOIN rel_equivalent_discipline ON
rel_equivalent_id = equivalent_id LEFT JOIN discipline ON discipline_id =
rel_discipline_id where equivalent_id = '${equivalents.equivalent_id}'
GROUP BY equivalent_id) temp">
+ <field column="equivalents" name="padanan"/>
+ </entity>
+ </entity>
+
+ </entity>
+ </document>
+</dataConfig>
=======================================
--- /dev/null
+++
/branches/kateglox/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb
Fri Jul 27 05:44:43 2012
@@ -0,0 +1,1649 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+
+<config>
+ 
+
+ 
+
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+
+ 
+ <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
+
+ 
+
+ 
+ 
+
+ 
+ <lib dir="/home/<%= globalUser %>/solr/dist/"
regex="apache-solr-cell-\d.*\.jar" />
+ <lib dir="/home/<%= globalUser %>/solr/contrib/extraction/lib"
regex=".*\.jar" />
+
+ <lib dir="/home/<%= globalUser %>/solr/dist/"
regex="apache-solr-clustering-\d.*\.jar" />
+ <lib dir="/home/<%= globalUser %>/solr/contrib/clustering/lib/"
regex=".*\.jar" />
+
+ <lib dir="/home/<%= globalUser %>/solr/dist/"
regex="apache-solr-dataimporthandler-\d.*\.jar" />
+ <lib dir="/home/<%= globalUser %>/solr/contrib/dataimporthandler/lib/"
regex=".*\.jar" />
+
+ <lib dir="/home/<%= globalUser %>/solr/dist/"
regex="apache-solr-langid-\d.*\.jar" />
+ <lib dir="/home/<%= globalUser %>/solr/contrib/langid/lib/"
regex=".*\.jar" />
+
+ <lib dir="/home/<%= globalUser %>/solr/dist/"
regex="apache-solr-velocity-\d.*\.jar" />
+ <lib dir="/home/<%= globalUser %>/solr/contrib/velocity/lib"
regex=".*\.jar" />
+ <lib dir="/home/<%= globalUser %>/solr/dist/"
regex="mysql-connector-java-\d.*\-bin.jar" />
+
+
+ 
+ <lib dir="/total/crap/dir/ignored" />
+
+ 
+ 
+ <lib dir="../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />
+ 
+ <dataDir>${solr.data.dir:}</dataDir>
+
+
+ 
+ <directoryFactory name="DirectoryFactory"
+
class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+
+ 
+ <indexConfig>
+ 
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ </indexConfig>
+
+
+ 
+ <jmx />
+ 
+ 
+ 
+ 
+
+ 
+ <updateHandler class="solr.DirectUpdateHandler2">
+
+ 
+ 
+
+ 
+ 
+ 
+ 
+ </updateHandler>
+
+ 
+ 
+ 
+ 
+
+ 
+ <query>
+ 
+ <maxBooleanClauses>1024</maxBooleanClauses>
+
+
+ 
+
+ 
+ <filterCache class="solr.FastLRUCache"
+ size="512"
+ initialSize="512"
+ autowarmCount="0"/>
+
+ 
+ <queryResultCache class="solr.LRUCache"
+ size="512"
+ initialSize="512"
+ autowarmCount="0"/>
+
+ 
+ <documentCache class="solr.LRUCache"
+ size="512"
+ initialSize="512"
+ autowarmCount="0"/>
+
+ 
+ 
+
+ 
+ 
+
+
+ 
+ <enableLazyFieldLoading>true</enableLazyFieldLoading>
+
+ 
+ 
+
+ 
+ <queryResultWindowSize>20</queryResultWindowSize>
+
+ 
+ <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
+
+ 
+ 
+ <listener event="newSearcher" class="solr.QuerySenderListener">
+ <arr name="queries">
+ 
+ </arr>
+ </listener>
+ <listener event="firstSearcher" class="solr.QuerySenderListener">
+ <arr name="queries">
+ <lst>
+ <str name="q">static firstSearcher warming in
solrconfig.xml</str>
+ </lst>
+ </arr>
+ </listener>
+
+ 
+ <useColdSearcher>false</useColdSearcher>
+
+ 
+ <maxWarmingSearchers>2</maxWarmingSearchers>
+
+ </query>
+
+
+ 
+ <requestDispatcher>
+ 
+ <requestParsers enableRemoteStreaming="true"
+ multipartUploadLimitInKB="2048000" />
+
+ 
+ <httpCaching never304="true" />
+ 
+ 
+ 
+ 
+ </requestDispatcher>
+
+ 
+ 
+ <requestHandler name="/select" class="solr.SearchHandler"
default="true">
+ 
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ <int name="rows">10</int>
+ <str name="spellcheck.onlyMorePopular">false</str>
+ <str name="spellcheck.extendedResults">false</str>
+ <str name="spellcheck.count">10</str>
+ <str name="spellcheck.collate">true</str>
+ <str name="spellcheck.maxCollationTries">100</str>
+ </lst>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ <arr name="last-components">
+ <str>spellcheck</str>
+ </arr>
+ </requestHandler>
+
+ 
+ <requestHandler name="/browse" class="solr.SearchHandler">
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+
+ 
+ <str name="wt">velocity</str>
+
+ <str name="v.template">browse</str>
+ <str name="v.layout">layout</str>
+ <str name="title">Solritas</str>
+
+ <str name="df">text</str>
+ <str name="defType">edismax</str>
+ <str name="q.alt">*:*</str>
+ <str name="rows">10</str>
+ <str name="fl">*,score</str>
+ <str name="mlt.qf">
+ text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+ </str>
+ <str name="mlt.fl">text,features,name,sku,id,manu,cat</str>
+ <int name="mlt.count">3</int>
+
+ <str name="qf">
+ text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+ </str>
+
+ <str name="facet">on</str>
+ <str name="facet.field">cat</str>
+ <str name="facet.field">manu_exact</str>
+ <str name="facet.query">ipod</str>
+ <str name="facet.query">GB</str>
+ <str name="facet.mincount">1</str>
+ <str name="facet.pivot">cat,inStock</str>
+ <str name="facet.range.other">after</str>
+ <str name="facet.range">price</str>
+ <int name="f.price.facet.range.start">0</int>
+ <int name="f.price.facet.range.end">600</int>
+ <int name="f.price.facet.range.gap">50</int>
+ <str name="f.price.facet.range.other">after</str>
+ <str name="facet.range">popularity</str>
+ <int name="f.popularity.facet.range.start">0</int>
+ <int name="f.popularity.facet.range.end">10</int>
+ <int name="f.popularity.facet.range.gap">3</int>
+ <str name="facet.range">manufacturedate_dt</str>
+ <str
name="f.manufacturedate_dt.facet.range.start">NOW/YEAR-10YEARS</str>
+ <str name="f.manufacturedate_dt.facet.range.end">NOW</str>
+ <str name="f.manufacturedate_dt.facet.range.gap">+1YEAR</str>
+ <str name="f.manufacturedate_dt.facet.range.other">before</str>
+ <str name="f.manufacturedate_dt.facet.range.other">after</str>
+
+
+ 
+ <str name="hl">on</str>
+ <str name="hl.fl">text features name</str>
+ <str name="f.name.hl.fragsize">0</str>
+ <str name="f.name.hl.alternateField">name</str>
+ </lst>
+ <arr name="last-components">
+ <str>spellcheck</str>
+ </arr>
+ 
+ </requestHandler>
+
+ 
+ <requestHandler name="/update"
+ class="solr.XmlUpdateRequestHandler">
+ 
+ 
+ </requestHandler>
+ 
+ <requestHandler name="/update/javabin"
+ class="solr.BinaryUpdateRequestHandler" />
+
+ 
+ <requestHandler name="/update/csv"
+ class="solr.CSVRequestHandler"
+ startup="lazy" />
+
+ 
+ <requestHandler name="/update/json"
+ class="solr.JsonUpdateRequestHandler"
+ startup="lazy" />
+
+ 
+ <requestHandler name="/update/extract"
+ startup="lazy"
+ class="solr.extraction.ExtractingRequestHandler" >
+ <lst name="defaults">
+ 
+ <str name="fmap.content">text</str>
+ <str name="lowernames">true</str>
+ <str name="uprefix">ignored_</str>
+
+ 
+ <str name="captureAttr">true</str>
+ <str name="fmap.a">links</str>
+ <str name="fmap.div">ignored_</str>
+ </lst>
+ </requestHandler>
+
+ 
+ <requestHandler name="/update/xslt"
+ startup="lazy"
+ class="solr.XsltUpdateRequestHandler"/>
+
+ 
+ <requestHandler name="/analysis/field"
+ startup="lazy"
+ class="solr.FieldAnalysisRequestHandler" />
+
+
+ 
+ <requestHandler name="/analysis/document"
+ class="solr.DocumentAnalysisRequestHandler"
+ startup="lazy" />
+
+ 
-
-
-<config>
- 
-
- 
-
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-
- 
- <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
-
- 
-
- 
- 
-
- 
- <lib dir="/home/vagrant/solr/dist/" regex="apache-solr-cell-\d.*\.jar" />
- <lib dir="/home/vagrant/solr/contrib/extraction/lib" regex=".*\.jar" />
-
- <lib dir="/home/vagrant/solr/dist/"
regex="apache-solr-clustering-\d.*\.jar" />
- <lib dir="/home/vagrant/solr/contrib/clustering/lib/" regex=".*\.jar"
/>
-
- <lib dir="/home/vagrant/solr/dist/"
regex="apache-solr-dataimporthandler-\d.*\.jar" />
- <lib dir="/home/vagrant/solr/contrib/dataimporthandler/lib/"
regex=".*\.jar" />
-
- <lib dir="/home/vagrant/solr/dist/"
regex="apache-solr-langid-\d.*\.jar" />
- <lib dir="/home/vagrant/solr/contrib/langid/lib/" regex=".*\.jar" />
-
- <lib dir="/home/vagrant/solr/dist/"
regex="apache-solr-velocity-\d.*\.jar" />
- <lib dir="/home/vagrant/solr/contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="/home/vagrant/solr/dist/"
regex="mysql-connector-java-\d.*\-bin.jar" />
-
-
- 
- <lib dir="/total/crap/dir/ignored" />
-
- 
- 
- <lib dir="../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />
- 
- <dataDir>${solr.data.dir:}</dataDir>
-
-
- 
- <directoryFactory name="DirectoryFactory"
-
class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
-
- 
- <indexConfig>
- 
- 
- 
- 
-
- 
- 
-
- 
- 
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- </indexConfig>
-
-
- 
- <jmx />
- 
- 
- 
- 
-
- 
- <updateHandler class="solr.DirectUpdateHandler2">
-
- 
- 
-
- 
- 
- 
- 
- </updateHandler>
-
- 
- 
- 
- 
-
- 
- <query>
- 
- <maxBooleanClauses>1024</maxBooleanClauses>
-
-
- 
-
- 
- <filterCache class="solr.FastLRUCache"
- size="512"
- initialSize="512"
- autowarmCount="0"/>
-
- 
- <queryResultCache class="solr.LRUCache"
- size="512"
- initialSize="512"
- autowarmCount="0"/>
-
- 
- <documentCache class="solr.LRUCache"
- size="512"
- initialSize="512"
- autowarmCount="0"/>
-
- 
- 
-
- 
- 
-
-
- 
- <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
- 
- 
-
- 
- <queryResultWindowSize>20</queryResultWindowSize>
-
- 
- <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
- 
- 
- <listener event="newSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- 
- </arr>
- </listener>
- <listener event="firstSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- <lst>
- <str name="q">static firstSearcher warming in
solrconfig.xml</str>
- </lst>
- </arr>
- </listener>
-
- 
- <useColdSearcher>false</useColdSearcher>
-
- 
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
- </query>
-
-
- 
- <requestDispatcher>
- 
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000" />
-
- 
- <httpCaching never304="true" />
- 
- 
- 
- 
- </requestDispatcher>
-
- 
- 
- <requestHandler name="/select" class="solr.SearchHandler"
default="true">
- 
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- <int name="rows">10</int>
- <str name="spellcheck.onlyMorePopular">false</str>
- <str name="spellcheck.extendedResults">false</str>
- <str name="spellcheck.count">10</str>
- <str name="spellcheck.collate">true</str>
- <str name="spellcheck.maxCollationTries">100</str>
- </lst>
- 
- 
- 
- 
- 
- 
- 
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
-
- 
- <requestHandler name="/browse" class="solr.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
-
- 
- <str name="wt">velocity</str>
-
- <str name="v.template">browse</str>
- <str name="v.layout">layout</str>
- <str name="title">Solritas</str>
-
- <str name="df">text</str>
- <str name="defType">edismax</str>
- <str name="q.alt">*:*</str>
- <str name="rows">10</str>
- <str name="fl">*,score</str>
- <str name="mlt.qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
- </str>
- <str name="mlt.fl">text,features,name,sku,id,manu,cat</str>
- <int name="mlt.count">3</int>
-
- <str name="qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
- </str>
-
- <str name="facet">on</str>
- <str name="facet.field">cat</str>
- <str name="facet.field">manu_exact</str>
- <str name="facet.query">ipod</str>
- <str name="facet.query">GB</str>
- <str name="facet.mincount">1</str>
- <str name="facet.pivot">cat,inStock</str>
- <str name="facet.range.other">after</str>
- <str name="facet.range">price</str>
- <int name="f.price.facet.range.start">0</int>
- <int name="f.price.facet.range.end">600</int>
- <int name="f.price.facet.range.gap">50</int>
- <str name="f.price.facet.range.other">after</str>
- <str name="facet.range">popularity</str>
- <int name="f.popularity.facet.range.start">0</int>
- <int name="f.popularity.facet.range.end">10</int>
- <int name="f.popularity.facet.range.gap">3</int>
- <str name="facet.range">manufacturedate_dt</str>
- <str
name="f.manufacturedate_dt.facet.range.start">NOW/YEAR-10YEARS</str>
- <str name="f.manufacturedate_dt.facet.range.end">NOW</str>
- <str name="f.manufacturedate_dt.facet.range.gap">+1YEAR</str>
- <str name="f.manufacturedate_dt.facet.range.other">before</str>
- <str name="f.manufacturedate_dt.facet.range.other">after</str>
-
-
- 
- <str name="hl">on</str>
- <str name="hl.fl">text features name</str>
- <str name="f.name.hl.fragsize">0</str>
- <str name="f.name.hl.alternateField">name</str>
- </lst>
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- 
- </requestHandler>
-
- 
- <requestHandler name="/update"
- class="solr.XmlUpdateRequestHandler">
- 
- 
- </requestHandler>
- 
- <requestHandler name="/update/javabin"
- class="solr.BinaryUpdateRequestHandler" />
-
- 
- <requestHandler name="/update/csv"
- class="solr.CSVRequestHandler"
- startup="lazy" />
-
- 
- <requestHandler name="/update/json"
- class="solr.JsonUpdateRequestHandler"
- startup="lazy" />
-
- 
- <requestHandler name="/update/extract"
- startup="lazy"
- class="solr.extraction.ExtractingRequestHandler" >
- <lst name="defaults">
- 
- <str name="fmap.content">text</str>
- <str name="lowernames">true</str>
- <str name="uprefix">ignored_</str>
-
- 
- <str name="captureAttr">true</str>
- <str name="fmap.a">links</str>
- <str name="fmap.div">ignored_</str>
- </lst>
- </requestHandler>
-
- 
- <requestHandler name="/update/xslt"
- startup="lazy"
- class="solr.XsltUpdateRequestHandler"/>
-
- 
- <requestHandler name="/analysis/field"
- startup="lazy"
- class="solr.FieldAnalysisRequestHandler" />
-
-
- 
- <requestHandler name="/analysis/document"
- class="solr.DocumentAnalysisRequestHandler"
- startup="lazy" />
-
- <!-- Admin Handlers
-
- Admin Handlers - This will register all the standard admin
***The diff for this file has been truncated for email.***
=======================================
--- /branches/kateglox/.idea/workspace.xml Sat Jul 21 04:14:51 2012
+++ /branches/kateglox/.idea/workspace.xml Fri Jul 27 05:44:43 2012
@@ -2,42 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" readonly="true"
id="7fad7703-02e1-4f4f-8603-084b2e534c9a" name="Default" comment="">
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/mysql/files" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/kateglox.sql"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf" />
- <change type="DELETED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\mapping-ISOLatin1Accent.txt"
afterPath="" />
- <change type="DELETED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\scripts.conf"
afterPath="" />
- <change type="DELETED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\library\Stubbles\bootstrap.php"
afterPath="" />
- <change type="DELETED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\dataimport.properties"
afterPath="" />
- <change type="DELETED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr"
afterPath="" />
- <change type="DELETED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\library\Stubbles"
afterPath="" />
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\data-config.xml"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/data-config.xml"
/>
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\elevate.xml"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/elevate.xml"
/>
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\protwords.txt"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/protwords.txt"
/>
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\schema.xml"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/schema.xml" />
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\solrconfig.xml"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/solrconfig.xml"
/>
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\spellings.txt"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/spellings.txt"
/>
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\stopwords.txt"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/stopwords.txt"
/>
- <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\build\solr\synonyms.txt"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/synonyms.txt"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/configs/application.ini"
afterPath="$PROJECT_DIR$/application/configs/application.ini" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates" />
+ <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\vagrant\puppet\modules\kateglo\files\data-config.xml"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb"
/>
+ <change type="MOVED"
beforePath="C:\Users\Purnama\StormWorkspace\kateglo\vagrant\puppet\modules\kateglo\files\solrconfig.xml"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb"
/>
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/configs/Binder.php"
afterPath="$PROJECT_DIR$/application/configs/Binder.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/providers/Config.php"
afterPath="$PROJECT_DIR$/application/providers/Config.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/providers/Connection.php"
afterPath="$PROJECT_DIR$/application/providers/Connection.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/providers/EntityManager.php"
afterPath="$PROJECT_DIR$/application/providers/EntityManager.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/providers/Log.php"
afterPath="$PROJECT_DIR$/application/providers/Log.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/providers/Solr.php"
afterPath="$PROJECT_DIR$/application/providers/Solr.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/utilities/Injector.php"
afterPath="$PROJECT_DIR$/application/utilities/Injector.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/utilities/REST.php"
afterPath="$PROJECT_DIR$/application/utilities/REST.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/utilities/interfaces/REST.php"
afterPath="$PROJECT_DIR$/application/utilities/interfaces/REST.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/library/Zend/Controller/Dispatcher/Stubbles.php"
afterPath="$PROJECT_DIR$/library/Zend/Controller/Dispatcher/Stubbles.php" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/index.php"
afterPath="$PROJECT_DIR$/public/index.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/manifests/main.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/manifests/main.pp" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/diverse/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/diverse/manifests/init.pp"
/>
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp"
/>
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb"
/>
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -59,46 +34,73 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="init.pp" pinned="false" current="true"
current-in-tab="true">
+ <file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="26" selection-start="1429"
selection-end="1429" vertical-scroll-proportion="0.03057554">
+ <state line="68" column="65" selection-start="2293"
selection-end="2293" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp">
+ <file leaf-file-name="my.cnf" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="4" selection-start="1209"
selection-end="1209" vertical-scroll-proportion="0.0">
+ <state line="48" column="125" selection-start="1430"
selection-end="1430" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
+ <file leaf-file-name="default.jetty.erb" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="114" column="30" selection-start="3865"
selection-end="3866" vertical-scroll-proportion="0.0">
+ <state line="27" column="85" selection-start="803"
selection-end="803" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="site.erb" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/apache/templates/site.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="3" column="17" selection-start="66"
selection-end="85" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="21" selection-start="307"
selection-end="307" vertical-scroll-proportion="0.0">
+ <state line="13" column="46" selection-start="393"
selection-end="393" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="main.pp" pinned="false" current="false"
current-in-tab="false">
+ <file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/diverse/manifests/init.pp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="8" column="0" selection-start="261"
selection-end="261" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="solrconfig.xml.erb" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1111" column="39" selection-start="43089"
selection-end="43089" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="main.pp" pinned="false" current="true"
current-in-tab="true">
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/manifests/main.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="4" selection-start="253"
selection-end="253" vertical-scroll-proportion="0.0">
+ <state line="6" column="22" selection-start="161"
selection-end="161" vertical-scroll-proportion="0.17926186">
<folding />
</state>
</provider>
@@ -107,12 +109,21 @@
<file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="107" selection-start="255"
selection-end="255" vertical-scroll-proportion="0.0">
+ <state line="33" column="61" selection-start="840"
selection-end="840" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="data-config.xml.erb" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="2" column="47" selection-start="192"
selection-end="192" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -123,22 +134,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/application/providers/Solr.php" />
- <option
value="$PROJECT_DIR$/library/Zend/Controller/Dispatcher/Stubbles.php" />
- <option value="$PROJECT_DIR$/application/utilities/REST.php" />
- <option
value="$PROJECT_DIR$/application/utilities/interfaces/REST.php" />
<option value="$PROJECT_DIR$/application/configs/application.ini"
/>
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/build/solr/data-config.xml" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/schema.xml" />
- <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/solrconfig.xml" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf" />
- <option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp" />
- <option value="$PROJECT_DIR$/vagrant/puppet/manifests/main.pp" />
- <option
value="$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/diverse/manifests/init.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/solrconfig.xml" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb"
/>
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb"
/>
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb"
/>
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp" />
+ <option value="$PROJECT_DIR$/vagrant/puppet/manifests/main.pp" />
</list>
</option>
</component>
@@ -202,6 +213,16 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Scope">
+ <subPane subId="Project Files">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -277,6 +298,10 @@
<option name="myItemId" value="solr" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="templates" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -391,6 +416,36 @@
</PATH_ELEMENT>
</PATH>
<PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="vagrant" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="puppet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="templates" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
<option name="myItemId" value="kateglo" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
@@ -481,6 +536,62 @@
</PATH_ELEMENT>
</PATH>
<PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="vagrant" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="puppet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="apache" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="templates" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="vagrant" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="puppet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="apache" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
<option name="myItemId" value="kateglo" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
@@ -544,16 +655,6 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- </subPane>
- </pane>
- <pane id="Scope">
- <subPane subId="Project Files">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
</panes>
@@ -562,8 +663,8 @@
<property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="options.lastSelected" value="preferences.keymap" />
- <property name="options.searchVisible" value="true" />
<property name="options.splitter.details.proportions" value="0.2" />
+ <property name="options.searchVisible" value="true" />
</component>
<component name="PublishConfig" serverName="kateglo-vagrant"
serverId="5947b0bc-2fa8-46b7-b5d6-2f09f74c0bdc" autoUpload="true">
<servers>
@@ -578,6 +679,7 @@
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
+ <recent
name="C:\Users\Purnama\StormWorkspace\kateglo\vagrant\puppet\modules\kateglo\templates"
/>
<recent
name="C:\Users\Purnama\StormWorkspace\kateglo\vagrant\puppet\modules\kateglo\files"
/>
</key>
</component>
@@ -688,30 +790,58 @@
<created>1342514427103</created>
<updated>1342514427103</updated>
</task>
- <option name="localTasksCounter" value="8" />
+ <task id="LOCAL-00008" summary="Refactor Kateglo to work with new
third party library structure">
+ <created>1342869593113</created>
+ <updated>1342869593113</updated>
+ </task>
+ <task id="LOCAL-00009" summary="Refactor Kateglo to work with new
third party library structure">
+ <created>1342954281108</created>
+ <updated>1342954281108</updated>
+ </task>
+ <option name="localTasksCounter" value="10" />
<servers />
+ </component>
+ <component name="TodoView" selected-index="0">
+ <todo-panel id="selected-file">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </todo-panel>
+ <todo-panel id="all">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </todo-panel>
+ <todo-panel id="default-changelist">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="754" extended-state="6" />
<editor active="false" />
<layout>
+ <window_info id="File Transfer" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32491583" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Data Sources" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
- <window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3289183" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="6" side_tool="false"
content_ui="tabs" />
+ <window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32828283" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32996634" sideWeight="0.5" order="6" side_tool="false"
content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs"
/>
<window_info id="Remote Host" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.27272728" sideWeight="0.67171717" order="0" side_tool="false"
content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.21363637" sideWeight="0.6750842" order="0" side_tool="false"
content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"
/>
<window_info id="Favorites" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs"
/>
<window_info id="Event Log" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32996634" sideWeight="0.5" order="7" side_tool="true"
content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="2" side_tool="false"
content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
- <window_info id="File Transfer" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32491583" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="4" side_tool="false"
content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="0" side_tool="false"
content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="1" side_tool="false"
content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.43434343" sideWeight="0.5" order="1" side_tool="false"
content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.32828283" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.28451177" sideWeight="0.5" order="1" side_tool="false"
content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32828283" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs"
/>
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="2" side_tool="false"
content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3989899" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
@@ -780,86 +910,88 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/application/configs/application.ini">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/spellings.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="37" selection-start="778"
selection-end="1248" vertical-scroll-proportion="-4.76" />
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/application/modules/default/views/macros/header.html">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/synonyms.txt">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/application/modules/default/controllers/IndexController.php">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/stopwords.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="3844926" selection-start="3056"
selection-end="3394" vertical-scroll-proportion="-0.65384614" />
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/data-config.xml">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/schema.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="96" selection-start="109"
selection-end="109" vertical-scroll-proportion="0.03057554" />
+ <state line="491" column="8" selection-start="27953"
selection-end="27953" vertical-scroll-proportion="0.03057554" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/spellings.txt">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
+ <state line="42" column="4" selection-start="1209"
selection-end="1209" vertical-scroll-proportion="0.029876977" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/synonyms.txt">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
+ <state line="106" column="27" selection-start="3777"
selection-end="3785" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/stopwords.txt">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
+ <state line="27" column="85" selection-start="803"
selection-end="803" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/schema.xml">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/apache/templates/site.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="491" column="8" selection-start="27953"
selection-end="27953" vertical-scroll-proportion="0.03057554" />
+ <state line="3" column="17" selection-start="66"
selection-end="85" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/solrconfig.xml">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="92" column="14" selection-start="3940"
selection-end="3964" vertical-scroll-proportion="0.029876977" />
+ <state line="13" column="46" selection-start="393"
selection-end="393" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/diverse/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="0" selection-start="1389"
selection-end="1389" vertical-scroll-proportion="0.0" />
+ <state line="8" column="0" selection-start="261"
selection-end="261" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="4" selection-start="1209"
selection-end="1209" vertical-scroll-proportion="0.0" />
+ <state line="1111" column="39" selection-start="43089"
selection-end="43089" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="114" column="30" selection-start="3865"
selection-end="3866" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="2" column="47" selection-start="192"
selection-end="192" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/bootstrap/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="21" selection-start="307"
selection-end="307" vertical-scroll-proportion="0.0" />
+ <state line="48" column="125" selection-start="1430"
selection-end="1430" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/vagrant/puppet/manifests/main.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="4" selection-start="253"
selection-end="253" vertical-scroll-proportion="0.0" />
+ <state line="33" column="61" selection-start="840"
selection-end="840" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="107" selection-start="255"
selection-end="255" vertical-scroll-proportion="0.0" />
+ <state line="68" column="65" selection-start="2293"
selection-end="2293" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
+ <entry file="file://$PROJECT_DIR$/vagrant/puppet/manifests/main.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="26" selection-start="1429"
selection-end="1429" vertical-scroll-proportion="0.03057554">
+ <state line="6" column="22" selection-start="161"
selection-end="161" vertical-scroll-proportion="0.17926186">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/vagrant/puppet/manifests/main.pp Mon Jul 16 15:08:20
2012
+++ /branches/kateglox/vagrant/puppet/manifests/main.pp Fri Jul 27 05:44:43
2012
@@ -2,6 +2,11 @@
Exec {
path =>
["/usr/bin", "/bin", "/usr/sbin", "/sbin", "/usr/local/bin", "/usr/local/sbin"]
}
+
+$globalUser = 'vagrant'
+$mysqlRootPassword = ""
+$mysqlUser = ""
+$mysqlUserPassword = ""

node default{
include bootstrap
=======================================
--- /branches/kateglox/vagrant/puppet/modules/bootstrap/manifests/init.pp
Sat Jul 21 04:14:51 2012
+++ /branches/kateglox/vagrant/puppet/modules/bootstrap/manifests/init.pp
Fri Jul 27 05:44:43 2012
@@ -11,7 +11,7 @@
}

# create download directory
- file { '/home/vagrant/downloads':
+ file { "/home/${globalUser}/downloads":
ensure => 'directory',
}
}
=======================================
--- /branches/kateglox/vagrant/puppet/modules/diverse/manifests/init.pp Wed
Jul 4 08:55:39 2012
+++ /branches/kateglox/vagrant/puppet/modules/diverse/manifests/init.pp Fri
Jul 27 05:44:43 2012
@@ -7,14 +7,4 @@
require => Exec["apt-get update"]
}

- # After installing augeas and augeas ruby, this step must be taken so
- exec { "ln -s /usr/lib/ruby/1.8/x86_64-linux/_augeas.so
/opt/vagrant_ruby/lib/ruby/site_ruby/1.8/x86_64-linux/":
- creates
=> "/opt/vagrant_ruby/lib/ruby/site_ruby/1.8/x86_64-linux/_augeas.so",
- require => [Package["augeas-tools"], Package["libaugeas-dev"],
Package["libaugeas-ruby"]],
- }
-
- exec { "ln -s /usr/lib/ruby/1.8/augeas.rb
/opt/vagrant_ruby/lib/ruby/site_ruby/1.8/":
- creates => "/opt/vagrant_ruby/lib/ruby/site_ruby/1.8/augeas.rb",
- require => [Package["augeas-tools"], Package["libaugeas-dev"],
Package["libaugeas-ruby"]],
- }
-}
+}
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Sun
Jul 22 03:51:18 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Fri
Jul 27 05:44:43 2012
@@ -1,67 +1,81 @@
class kateglo {

- file { '/home/vagrant/log':
- ensure => 'directory',
- group => 'www-data',
- owner => 'www-data',
- require => [Package['apache2']]
+ file { "/home/${globalUser}/log":
+ ensure => "directory",
+ group => "www-data",
+ owner => "www-data",
+ require => [Package["apache2"]]
}

exec { "checkout kateglo" :
command => "svn co
https://kateglo.googlecode.com/svn/branches/kateglox kateglo",
- cwd => '/home/vagrant/',
- creates => '/home/vagrant/kateglo',
+ cwd => "/home/${globalUser}/",
+ creates => "/home/${globalUser}/kateglo",
timeout => 0,
- require => [Package['apache2'], Package['subversion']],
+ require => [Package["apache2"], Package["subversion"]],
}

- file { '/home/vagrant/kateglo':
- ensure => 'directory',
+ file { "/home/${globalUser}/kateglo":
+ ensure => "directory",
recurse => inf,
- group => 'www-data',
- owner => 'www-data',
+ group => "www-data",
+ owner => "www-data",
require => [Exec["checkout kateglo"]]
}

- file { '/home/vagrant/kateglo/cache':
- ensure => 'directory',
+ file { "/home/${globalUser}/kateglo/cache":
+ ensure => "directory",
recurse => inf,
- group => 'www-data',
- owner => 'www-data',
+ group => "www-data",
+ owner => "www-data",
require => [Exec["checkout kateglo"]]
}

- exec { 'curl -s http://getcomposer.org/installer | php' :
- cwd => '/home/vagrant/kateglo',
- user => 'www-data',
- group => 'www-data',
+ exec { "curl -s http://getcomposer.org/installer | php" :
+ cwd => "/home/${globalUser}/kateglo",
+ user => "www-data",
+ group => "www-data",
timeout => 0,
- creates => '/home/vagrant/kateglo/composer.phar',
+ creates => "/home/${globalUser}/kateglo/composer.phar",
logoutput => true,
- require => [Package['curl'],Exec["checkout kateglo"]],
+ require => [Package["curl"],Exec["checkout kateglo"]],
}

- exec { 'php composer.phar install' :
- cwd => '/home/vagrant/kateglo',
- creates => '/home/vagrant/kateglo/vendor',
+ exec { "php composer.phar install" :
+ cwd => "/home/${globalUser}/kateglo",
+ creates => "/home/${globalUser}/kateglo/vendor",
user => "root",
group => "root",
timeout => 0,
logoutput => true,
- require => [Package['php5'],Exec['curl -s
http://getcomposer.org/installer | php']],
+ require => [Package["php5"],Exec["curl -s
http://getcomposer.org/installer | php"]],
notify => Exec["apache2ctl graceful"],
}

+
+ $identifiedByPassword = "identified by '${mysqlRootPassword}'"
exec { "create kateglo db":
- unless => "mysql -u root kateglox",
- command => "mysql -u root -e \"create database kateglox; grant all
on kateglox.* to root ;\"",
+ unless => "mysql -u root -p\"${mysqlRootPassword}\" kateglox",
+ command => "mysql -u root -p\"${mysqlRootPassword}\" -e \"create
database kateglox; grant all on kateglox.* to root
${identifiedByPassword};\"",
group => "root",
user => "root",
- require => [Service["mysql"], Package["mysql-server"]],
+ require => [Service["mysql"], Package["mysql-server"],
Exec["set-mysql-root-password"]],
}

- file { "/home/vagrant/kateglox.sql":
+ if $mysqlUser != "" {
+ if $mysqlUserPassword != "" {
+ exec { "grant table to user":
+ unless => "mysql -u ${mysqlUser} -p\"${mysqlUserPassword}\"
kateglox",
+ command => "mysql -u root -p\"${mysqlRootPassword}\" -e
\"grant all on kateglox.* to ${mysqlUser} identified
by '${mysqlUserPassword}'; grant all on kateglox.* to
${mysqlUser}@'localhost' identified by '${mysqlUserPassword}';\"",
+ group => "root",
+ user => "root",
+ require => [Service["mysql"], Package["mysql-server"],
Exec["create user"], Exec["create kateglo db"]],
+ }
+ }
+ }
+
+ file { "/home/${globalUser}/kateglox.sql":
ensure => present,
source => "puppet:///modules/kateglo/kateglox.sql",
require => Exec["create kateglo db"],
@@ -70,36 +84,36 @@

exec { "import kateglo dump":
refreshonly => true,
- command => "mysql -u root kateglox < kateglox.sql",
- cwd => "/home/vagrant/",
+ command => "mysql -u root -p\"${mysqlRootPassword}\" kateglox <
kateglox.sql",
+ cwd => "/home/${globalUser}/",
group => "root", user => "root",
logoutput => true,
timeout => 0,
- require => File["/home/vagrant/kateglox.sql"],
- subscribe => File["/home/vagrant/kateglox.sql"],
+ require => File["/home/${globalUser}/kateglox.sql"],
+ subscribe => File["/home/${globalUser}/kateglox.sql"],
}

# ServerAdmin webmaster@localhost
- $serverAdmin = 'webm...@kateglo.com'
+ $serverAdmin = "webm...@kateglo.com"

# DocumentRoot /var/www
- $documentRoot = '/home/vagrant/kateglo/public'
+ $documentRoot = "/home/${globalUser}/kateglo/public"

# ErrorLog ${APACHE_LOG_DIR}/error.log
- $errorLog = '${APACHE_LOG_DIR}/error.log'
+ $errorLog = "${APACHE_LOG_DIR}/error.log"

# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
- $logLevel = 'debug'
+ $logLevel = "debug"

file {"/etc/apache2/sites-available/kateglo":
- content => template('apache/site.erb'),
- owner => 'root',
- group => 'root',
+ content => template("apache/site.erb"),
+ owner => "root",
+ group => "root",
mode => 0644,
- require => Package['apache2'],
- ensure => 'present',
- notify => Exec['/usr/sbin/a2ensite kateglo'],
+ require => Package["apache2"],
+ ensure => "present",
+ notify => Exec["/usr/sbin/a2ensite kateglo"],
}

exec { "/usr/sbin/a2dissite default":
@@ -110,20 +124,34 @@

exec { "/usr/sbin/a2ensite kateglo":
require => File["/etc/apache2/sites-available/kateglo"],
- creates => '/etc/apache2/sites-enabled/kateglo',
+ creates => "/etc/apache2/sites-enabled/kateglo",
notify => Exec["apache2ctl graceful"],
}

- file { "/home/vagrant/solr/conf/data-config.xml":
+ if $mysqlRootPassword != "" {
+ if $mysqlUser != "" {
+ if $mysqlUserPassword != "" {
+ $solrDBUser = $mysqlUser
+ $solrDBPassword = $mysqlUserPassword
+ }
+ }else{
+ $solrDBUser = "root"
+ $solrDBPassword = $mysqlRootPassword
+ }
+ } else {
+ $solrDBUser = "root"
+ $solrDBPassword = ""
+ }
+ file { "/home/${globalUser}/solr/conf/data-config.xml":
ensure => present,
- source => "puppet:///modules/kateglo/data-config.xml",
+ content => template("kateglo/data-config.xml.erb"),
owner => "jetty", group => "jetty",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/elevate.xml":
+ file { "/home/${globalUser}/solr/conf/elevate.xml":
ensure => present,
source => "puppet:///modules/kateglo/elevate.xml",
owner => "jetty", group => "jetty",
@@ -132,7 +160,7 @@
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/protwords.txt":
+ file { "/home/${globalUser}/solr/conf/protwords.txt":
ensure => present,
source => "puppet:///modules/kateglo/protwords.txt",
owner => "jetty", group => "jetty",
@@ -141,7 +169,7 @@
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/schema.xml":
+ file { "/home/${globalUser}/solr/conf/schema.xml":
ensure => present,
source => "puppet:///modules/kateglo/schema.xml",
owner => "jetty", group => "jetty",
@@ -150,16 +178,16 @@
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/solrconfig.xml":
+ file { "/home/${globalUser}/solr/conf/solrconfig.xml":
ensure => present,
- source => "puppet:///modules/kateglo/solrconfig.xml",
+ content => template("kateglo/solrconfig.xml.erb"),
owner => "jetty", group => "jetty",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/spellings.txt":
+ file { "/home/${globalUser}/solr/conf/spellings.txt":
ensure => present,
source => "puppet:///modules/kateglo/spellings.txt",
owner => "jetty", group => "jetty",
@@ -168,7 +196,7 @@
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/stopwords.txt":
+ file { "/home/${globalUser}/solr/conf/stopwords.txt":
ensure => present,
source => "puppet:///modules/kateglo/stopwords.txt",
owner => "jetty", group => "jetty",
@@ -177,7 +205,7 @@
notify => Service["jetty"],
}

- file { "/home/vagrant/solr/conf/synonyms.txt":
+ file { "/home/${globalUser}/solr/conf/synonyms.txt":
ensure => present,
source => "puppet:///modules/kateglo/synonyms.txt",
owner => "jetty", group => "jetty",
@@ -194,11 +222,11 @@
exec { "solr full import":
command => "curl
http://127.0.0.1:8080/solr/dataimport?command=full-import",
logoutput => true,
- unless => "test -f /home/vagrant/solr/data/index/*.fdx",
- require => [File["/home/vagrant/solr/conf/synonyms.txt"],
File["/home/vagrant/solr/conf/stopwords.txt"],
- File["/home/vagrant/solr/conf/spellings.txt"],
File["/home/vagrant/solr/conf/solrconfig.xml"],
- File["/home/vagrant/solr/conf/schema.xml"],
File["/home/vagrant/solr/conf/protwords.txt"],
- File["/home/vagrant/solr/conf/elevate.xml"],
File["/home/vagrant/solr/conf/data-config.xml"],
+ unless => "test -f /home/${globalUser}/solr/data/index/*.fdx",
+ require => [File["/home/${globalUser}/solr/conf/synonyms.txt"],
File["/home/${globalUser}/solr/conf/stopwords.txt"],
+ File["/home/${globalUser}/solr/conf/spellings.txt"],
File["/home/${globalUser}/solr/conf/solrconfig.xml"],
+ File["/home/${globalUser}/solr/conf/schema.xml"],
File["/home/${globalUser}/solr/conf/protwords.txt"],
+ File["/home/${globalUser}/solr/conf/elevate.xml"],
File["/home/${globalUser}/solr/conf/data-config.xml"],
Exec["import kateglo dump"], Service["jetty"], Exec["wait for
jetty"]],

}
=======================================
--- /branches/kateglox/vagrant/puppet/modules/mysql/manifests/init.pp Sat
Jul 21 04:14:51 2012
+++ /branches/kateglox/vagrant/puppet/modules/mysql/manifests/init.pp Fri
Jul 27 05:44:43 2012
@@ -19,4 +19,26 @@
require => Package["mysql-server"],
notify => Service["mysql"],
}
-}
+
+
+ exec { "set-mysql-root-password":
+ unless => "mysqladmin -uroot -p\"${mysqlRootPassword}\" status",
+ command => "mysqladmin -uroot password \"${mysqlRootPassword}\"",
+ require => Service["mysql"],
+ group => "root",
+ user => "root",
+ }
+
+
+ if $mysqlUser != "" {
+ if $mysqlUserPassword != "" {
+ exec { "create user":
+ unless => "mysqladmin -u${mysqlUser} ${mysqlAddPassword}
status",
+ command => "mysql -u root -p\"${mysqlRootPassword}\" -e
\"create user ${mysqlUser} identified by ${mysqlUserPassword};\"",
+ group => "root",
+ user => "root",
+ require => [Service["mysql"], Package["mysql-server"],
Exec["set-mysql-root-password"]],
+ }
+ }
+ }
+}
=======================================
--- /branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp Sat
Jul 21 04:14:51 2012
+++ /branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp Fri
Jul 27 05:44:43 2012
@@ -21,22 +21,22 @@
$mysqlConnector = 'mysql-connector-java-5.1.21'

exec { "mysql connector" :
- cwd => "/home/vagrant/downloads/",
+ cwd => "/home/${globalUser}/downloads/",
command => "wget
http://ftp.dc.aleron.net/pub/mysql/Connector-J/${mysqlConnector}.tar.gz",
- unless => "test -f /home/vagrant/downloads/${mysqlConnector}.tar.gz",
+ unless => "test -f
/home/${globalUser}/downloads/${mysqlConnector}.tar.gz",
timeout => 0,
- require => [Package["jetty"], Package["mysql-server"],
File["/home/vagrant/downloads"]]
+ require => [Package["jetty"], Package["mysql-server"],
File["/home/${globalUser}/downloads"]]
}

exec { "mysql connector extract":
- cwd => "/home/vagrant/downloads",
- command => "tar -xvzf
/home/vagrant/downloads/${mysqlConnector}.tar.gz",
- unless => "test -d /home/vagrant/downloads/${mysqlConnector}",
+ cwd => "/home/${globalUser}/downloads",
+ command => "tar -xvzf
/home/${globalUser}/downloads/${mysqlConnector}.tar.gz",
+ unless => "test -d
/home/${globalUser}/downloads/${mysqlConnector}",
require => [ Exec["mysql connector"] ],
}

exec {"mysql connector link library":
- cwd => "/home/vagrant/downloads/${mysqlConnector}/",
+ cwd => "/home/${globalUser}/downloads/${mysqlConnector}/",
command => "ln -s ${mysqlConnector}-bin.jar /usr/share/jetty/lib/",
unless => "test -h /usr/share/jetty/lib/${mysqlConnector}-bin.jar",
require => [Exec["mysql connector extract"]],
@@ -45,28 +45,28 @@
$solrPackage = 'apache-solr-3.6.0'

exec {"solr wget":
- cwd => "/home/vagrant/downloads",
+ cwd => "/home/${globalUser}/downloads",
command => "wget
http://mirror.softaculous.com/apache/lucene/solr/3.6.0/${solrPackage}.tgz",
- unless => "test -f /home/vagrant/downloads/${solrPackage}.tgz",
+ unless => "test -f
/home/${globalUser}/downloads/${solrPackage}.tgz",
timeout => 0,
- require => [ Package["jetty"], File["/home/vagrant/downloads"] ],
+ require => [ Package["jetty"],
File["/home/${globalUser}/downloads"] ],
}

exec {"solr extract":
- cwd => "/home/vagrant/downloads",
- command => "tar -xvzf /home/vagrant/downloads/${solrPackage}.tgz",
- unless => "test -d /home/vagrant/downloads/${solrPackage}",
+ cwd => "/home/${globalUser}/downloads",
+ command => "tar -xvzf
/home/${globalUser}/downloads/${solrPackage}.tgz",
+ unless => "test -d /home/${globalUser}/downloads/${solrPackage}",
require => [ Package["jetty"], Exec["solr wget"] ],
}

exec {"solr move":
- cwd => "/home/vagrant/downloads/${solrPackage}/example",
- command => "cp -r solr /home/vagrant/",
- unless => "test -d /home/vagrant/solr",
+ cwd => "/home/${globalUser}/downloads/${solrPackage}/example",
+ command => "cp -r solr /home/${globalUser}/",
+ unless => "test -d /home/${globalUser}/solr",
require => [ Package["jetty"], Exec["solr extract"] ],
}

- file { "/home/vagrant/solr":
+ file { "/home/${globalUser}/solr":
ensure => directory,
recurse => inf,
owner => "jetty",
@@ -75,21 +75,21 @@
}

exec {"solr dist move":
- cwd => "/home/vagrant/downloads/${solrPackage}/",
- command => "cp -r dist /home/vagrant/solr",
- unless => "test -d /home/vagrant/solr/dist",
+ cwd => "/home/${globalUser}/downloads/${solrPackage}/",
+ command => "cp -r dist /home/${globalUser}/solr",
+ unless => "test -d /home/${globalUser}/solr/dist",
require => [ Package["jetty"], Exec["solr move"] ],
}

exec {"solr link library":
- cwd => "/home/vagrant/solr/dist/",
+ cwd => "/home/${globalUser}/solr/dist/",
command => "ln -s apache-solr-dataimporthandler-*
/usr/share/jetty/lib/",
unless => "test -h
/usr/share/jetty/lib/apache-solr-dataimporthandler-3.6.0.jar",
require => [Exec["solr dist move"]],
}

exec {"solr copy war":
- cwd => "/home/vagrant/solr/dist/",
+ cwd => "/home/${globalUser}/solr/dist/",
command => "cp ${solrPackage}.war /var/lib/jetty/webapps",
creates => "/var/lib/jetty/webapps/${solrPackage}.war",
unless => "test -f /var/lib/jetty/webapps/solr.war",
@@ -113,9 +113,9 @@
}

exec {"mysql connector copy library":
- cwd => "/home/vagrant/downloads/${mysqlConnector}/",
- command => "cp ${mysqlConnector}-bin.jar /home/vagrant/solr/dist/",
- unless => "test -f
/home/vagrant/solr/dist/${mysqlConnector}-bin.jar",
+ cwd => "/home/${globalUser}/downloads/${mysqlConnector}/",
+ command => "cp ${mysqlConnector}-bin.jar
/home/${globalUser}/solr/dist/",
+ unless => "test -f
/home/${globalUser}/solr/dist/${mysqlConnector}-bin.jar",
require => [Exec["mysql connector extract"], Exec["solr copy
war"]],
}

=======================================
---
/branches/kateglox/vagrant/puppet/modules/solr/templates/default.jetty.erb
Mon Jul 16 01:09:42 2012
+++
/branches/kateglox/vagrant/puppet/modules/solr/templates/default.jetty.erb
Fri Jul 27 05:44:43 2012
@@ -25,7 +25,7 @@
#JETTY_ARGS=

# Extra options to pass to the JVM
-JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true
-Dsolr.solr.home=/home/vagrant/solr $JAVA_OPTIONS"
+JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true -Dsolr.solr.home=/home/<%=
globalUser %>/solr $JAVA_OPTIONS"

# Home of Java installation.
JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/

Reply all

Reply to author

Forward

0 new messages