[kateglo] r504 committed - bugfix

[kat...@googlecode.com]

Revision: 504
Author: arthurpurnama
Date: Fri Dec 7 07:33:58 2012
Log: bugfix
http://code.google.com/p/kateglo/source/detail?r=504

Modified:
/branches/kateglox/.idea/kateglo.iml
/branches/kateglox/composer.json
/branches/kateglox/vagrant/puppet/manifests/main.pp
/branches/kateglox/vagrant/puppet/modules/apache/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/solr/templates/default.jetty.erb

=======================================
--- /branches/kateglox/.idea/kateglo.iml Fri Dec 7 06:28:38 2012
+++ /branches/kateglox/.idea/kateglo.iml Fri Dec 7 07:33:58 2012
@@ -8,15 +8,9 @@
<library name="PHARS">
<CLASSES>
<root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/composer.phar"
/>
- <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/classmap.phar"
/>
- <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar"
/>
- <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/Zend_LoaderTest.phar"
/>
</CLASSES>
<SOURCES>
<root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/composer.phar"
/>
- <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/classmap.phar"
/>
- <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar"
/>
- <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/Zend_LoaderTest.phar"
/>
</SOURCES>
</library>
</orderEntry>
=======================================
--- /branches/kateglox/composer.json Fri Dec 7 06:28:38 2012
+++ /branches/kateglox/composer.json Fri Dec 7 07:33:58 2012
@@ -3,7 +3,6 @@
"doctrine/orm" : "2.2.2",
"room13/PhpSolrClient" : "dev-master",
"stubbles/core" : "v2.0.0",
- "zendframework/zendframework1": "1.12.0",
"phptal/phptal" : "dev-html5_with_ns"
}
}
=======================================
--- /branches/kateglox/vagrant/puppet/manifests/main.pp Fri Jul 27 05:44:43
2012
+++ /branches/kateglox/vagrant/puppet/manifests/main.pp Fri Dec 7 07:33:58
2012
@@ -7,6 +7,11 @@
$mysqlRootPassword = ""
$mysqlUser = ""
$mysqlUserPassword = ""
+if $globalUser == "vagrant" {
+ $jettyUser = $globalUser
+} else {
+ $jettyUser = "jetty"
+}

node default{
include bootstrap
@@ -14,7 +19,7 @@
include apache
include php
include mysql
- include java
- include solr
- include kateglo
+ include java
+ include solr
+ include kateglo
}
=======================================
--- /branches/kateglox/vagrant/puppet/modules/apache/manifests/init.pp Mon
Jul 16 15:08:20 2012
+++ /branches/kateglox/vagrant/puppet/modules/apache/manifests/init.pp Fri
Dec 7 07:33:58 2012
@@ -55,5 +55,17 @@
ensure => 'present',
notify => Exec['apache2ctl graceful'],
}
+
+ if $globalUser == "vagrant"{
+ file {"/etc/apache2/envvars":
+ content => template('apache/envvars.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => 0644,
+ require => Package['apache2'],
+ ensure => 'present',
+ notify => Exec['apache2ctl graceful'],
+ }
+ }

}
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Wed
Oct 10 04:21:21 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Fri
Dec 7 07:33:58 2012
@@ -1,10 +1,19 @@
class kateglo {

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

exec { "checkout kateglo" :
@@ -15,33 +24,60 @@
require => [Package["apache2"], Package["subversion"]],
}

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


- file { "/home/${globalUser}/kateglo/cache":
- ensure => "directory",
- recurse => inf,
- group => "www-data",
- owner => "www-data",
- require => [Exec["checkout kateglo"]]
- }
+ file { "/home/${globalUser}/kateglo/cache":
+ ensure => "directory",
+ recurse => inf,
+ group => "www-data",
+ owner => "www-data",
+ require => [Exec["checkout kateglo"]]
+ }
+
+ exec { "get composer" :
+ command => "sudo -u \"www-data\" curl -s
http://getcomposer.org/installer | sudo php",
+ cwd => "/home/${globalUser}/kateglo",
+ timeout => 0,
+ creates => "/home/${globalUser}/kateglo/composer.phar",
+ logoutput => true,
+ require => [Package["curl"],Exec["checkout kateglo"],
File["/home/${globalUser}/kateglo"]],
+ }
+ }else{
+ file { "/home/${globalUser}/kateglo":
+ ensure => "directory",
+ recurse => inf,
+ group => "${globalUser}",
+ owner => "${globalUser}",
+ require => [Exec["checkout kateglo"]]
+ }
+
+ file { "/home/${globalUser}/kateglo/cache":
+ ensure => "directory",
+ recurse => inf,
+ group => "${globalUser}",
+ owner => "${globalUser}",
+ require => [Exec["checkout kateglo"]]
+ }

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

- exec { "sudo -u \"www-data\" php composer.phar install" :
+ exec { "php composer.phar install" :
cwd => "/home/${globalUser}/kateglo",
creates => "/home/${globalUser}/kateglo/vendor",
timeout => 0,
@@ -95,7 +131,6 @@
refreshonly => true,
command => "mysql -u root kateglox < kateglox.sql",
cwd => "/home/${globalUser}/",
- group => "root", user => "root",
logoutput => true,
timeout => 0,
require => File["/home/${globalUser}/kateglox.sql"],
@@ -156,24 +191,34 @@
file { "/home/${globalUser}/solr/conf/data-config.xml":
ensure => present,
content => template("kateglo/data-config.xml.erb"),
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
}

- file
{ "/home/${globalUser}/kateglo/application/configs/application.ini":
- ensure => present,
- content => template("kateglo/application.ini.erb"),
- owner => "www-data", group => "www-data",
- mode => "0644",
- require => [Exec["checkout kateglo"],
File["/home/${globalUser}/kateglo"]],
+ if $globalUser != "vagrant"{
+ file
{ "/home/${globalUser}/kateglo/application/configs/application.ini":
+ ensure => present,
+ content => template("kateglo/application.ini.erb"),
+ owner => "www-data", group => "www-data",
+ mode => "0644",
+ require => [Exec["checkout kateglo"],
File["/home/${globalUser}/kateglo"]],
+ }
+ }else{
+ file
{ "/home/${globalUser}/kateglo/application/configs/application.ini":
+ ensure => present,
+ content => template("kateglo/application.ini.erb"),
+ owner => "vagrant", group => "vagrant",
+ mode => "0644",
+ require => [Exec["checkout kateglo"],
File["/home/${globalUser}/kateglo"]],
+ }
}

file { "/home/${globalUser}/solr/conf/elevate.xml":
ensure => present,
source => "puppet:///modules/kateglo/elevate.xml",
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -182,7 +227,7 @@
file { "/home/${globalUser}/solr/conf/protwords.txt":
ensure => present,
source => "puppet:///modules/kateglo/protwords.txt",
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -191,7 +236,7 @@
file { "/home/${globalUser}/solr/conf/schema.xml":
ensure => present,
source => "puppet:///modules/kateglo/schema.xml",
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -200,7 +245,7 @@
file { "/home/${globalUser}/solr/conf/solrconfig.xml":
ensure => present,
content => template("kateglo/solrconfig.xml.erb"),
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -209,7 +254,7 @@
file { "/home/${globalUser}/solr/conf/spellings.txt":
ensure => present,
source => "puppet:///modules/kateglo/spellings.txt",
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -218,7 +263,7 @@
file { "/home/${globalUser}/solr/conf/stopwords.txt":
ensure => present,
source => "puppet:///modules/kateglo/stopwords.txt",
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -227,7 +272,7 @@
file { "/home/${globalUser}/solr/conf/synonyms.txt":
ensure => present,
source => "puppet:///modules/kateglo/synonyms.txt",
- owner => "jetty", group => "jetty",
+ owner => "${jettyUser}", group => "${jettyUser}",
mode => "0644",
require => File["/etc/default/jetty"],
notify => Service["jetty"],
@@ -245,11 +290,11 @@
if $globalUser == 'vagrant'{
exec {"wait for jetty":
require => [Service["jetty"], Exec["restart jetty"]],
- command => "wget --spider --tries 50 --retry-connrefused
--no-check-certificate http://127.0.0.1:8080/solr/",
+ command => "sudo wget --spider --tries 50 --retry-connrefused
--no-check-certificate http://127.0.0.1:8080/solr/",
}

exec { "solr full import":
- command => "sudo curl
http://127.0.0.1:8080/solr/dataimport?command=full-import",
+ command => "curl
http://127.0.0.1:8080/solr/dataimport?command=full-import",
logoutput => true,
unless => "test -f /home/${globalUser}/solr/data/index/*.fdx",
require =>
[File["/home/${globalUser}/solr/conf/synonyms.txt"],
File["/home/${globalUser}/solr/conf/stopwords.txt"],
=======================================
---
/branches/kateglox/vagrant/puppet/modules/solr/templates/default.jetty.erb
Fri Jul 27 05:44:43 2012
+++
/branches/kateglox/vagrant/puppet/modules/solr/templates/default.jetty.erb
Fri Dec 7 07:33:58 2012
@@ -8,7 +8,7 @@

# Run Jetty as this user ID (default: jetty)
# Set this to an empty string to prevent Jetty from starting automatically
-#JETTY_USER=jetty
+JETTY_USER=<%= @jettyUser %>

# Listen to connections from this network host
# Use 0.0.0.0 as host to accept all connections.