[kateglo] r487 committed - Refactor Kateglo to work with new third party library structure

[kat...@googlecode.com]

Revision: 487
Author: arthur.purnama
Date: Sun Jul 22 03:51:18 2012
Log: Refactor Kateglo to work with new third party library structure
http://code.google.com/p/kateglo/source/detail?r=487

Modified:
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp

=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Sat
Jul 21 04:14:51 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Sun
Jul 22 03:51:18 2012
@@ -26,6 +26,7 @@

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

exec { "create kateglo db":
unless => "mysql -u root kateglox",
- command => "mysql -u root -e \"create database kateglox; grant all
on kateglox.* to root@% ;\"",
+ command => "mysql -u root -e \"create database kateglox; grant all
on kateglox.* to root ;\"",
group => "root",
user => "root",
require => [Service["mysql"], Package["mysql-server"]],
@@ -71,6 +72,8 @@
refreshonly => true,
command => "mysql -u root kateglox < kateglox.sql",
cwd => "/home/vagrant/",
+ group => "root", user => "root",
+ logoutput => true,
timeout => 0,
require => File["/home/vagrant/kateglox.sql"],
subscribe => File["/home/vagrant/kateglox.sql"],
@@ -183,19 +186,21 @@
notify => Service["jetty"],
}

- #exec { "solr full import":
- # command => "curl
http://127.0.0.1:8080/solr/dataimport?command=full-import",
- # refreshonly => true,
- # owner => "jetty", group => "jetty",
- # subscribe => [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"]],
- # 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"], Exec["import kateglo
dump"]],
- #
- #}
+ exec {"wait for jetty":
+ require => Service["jetty"],
+ command => "wget --spider --tries 10 --retry-connrefused
--no-check-certificate http://127.0.0.1:8080/solr/",
+ }
+
+ 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"],
+ Exec["import kateglo dump"], Service["jetty"], Exec["wait for
jetty"]],
+
+ }

}