[kateglo] r493 committed - Making Puppet configurable

[kat...@googlecode.com]

Revision: 493
Author: arthur.purnama
Date: Tue Jul 31 03:08:40 2012
Log: Making Puppet configurable
http://code.google.com/p/kateglo/source/detail?r=493

Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/mysql/manifests/init.pp

=======================================
--- /branches/kateglox/.idea/workspace.xml Tue Jul 31 00:15:19 2012
+++ /branches/kateglox/.idea/workspace.xml Tue Jul 31 03:08:40 2012
@@ -3,7 +3,8 @@
<component name="ChangeListManager">
<list default="true" readonly="true"
id="7fad7703-02e1-4f4f-8603-084b2e534c9a" name="Default" comment="">
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/index.php"
afterPath="$PROJECT_DIR$/public/index.php" />
+ <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" />
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -34,10 +35,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="init.pp" pinned="false" current="false"
current-in-tab="false">
+ <file leaf-file-name="init.pp" pinned="false" current="true"
current-in-tab="true">
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="11" selection-start="3613"
selection-end="3618" vertical-scroll-proportion="-7.2">
+ <state line="224" column="36" selection-start="7775"
selection-end="7775" vertical-scroll-proportion="0.18047337">
<folding />
</state>
</provider>
@@ -52,10 +53,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="index.php" pinned="false" current="true"
current-in-tab="true">
+ <file leaf-file-name="index.php" pinned="false" current="false"
current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.34">
+ <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="-4.576923">
<folding />
</state>
</provider>
@@ -82,7 +83,7 @@
<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="43" column="111" selection-start="1297"
selection-end="1297" vertical-scroll-proportion="0.0">
+ <state line="35" column="68" selection-start="943"
selection-end="943" vertical-scroll-proportion="-9.2">
<folding />
</state>
</provider>
@@ -126,12 +127,12 @@
<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/manifests/main.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/php/templates/apc.ini.erb" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb"
/>
- <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp" />
<option value="$PROJECT_DIR$/public/index.php" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp" />
</list>
</option>
</component>
@@ -659,7 +660,11 @@
<created>1343717083327</created>
<updated>1343717083327</updated>
</task>
- <option name="localTasksCounter" value="14" />
+ <task id="LOCAL-00014" summary="Making Puppet configurable">
+ <created>1343718923103</created>
+ <updated>1343718923103</updated>
+ </task>
+ <option name="localTasksCounter" value="15" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@@ -824,44 +829,44 @@
<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/mysql/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="111" selection-start="1297"
selection-end="1297" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.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">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/solrconfig.xml.erb">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.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="14" column="24" selection-start="591"
selection-end="591" 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$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="11" selection-start="3613"
selection-end="3618" vertical-scroll-proportion="-7.2">
+ <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="-4.576923">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.0">
+ <state line="35" column="68" selection-start="943"
selection-end="943" vertical-scroll-proportion="-9.2">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/index.php">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.34">
+ <state line="224" column="36" selection-start="7775"
selection-end="7775" vertical-scroll-proportion="0.18047337">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Mon
Jul 30 23:44:37 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 03:08:40 2012
@@ -33,7 +33,7 @@
}

exec { "get composer" :
- command => "sudo \"www-data\" curl -s
http://getcomposer.org/installer | sudo -u\"www-data\" php",
+ 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",
@@ -41,11 +41,9 @@
require => [Package["curl"],Exec["checkout kateglo"],
File["/home/${globalUser}/kateglo"]],
}

- exec { "php composer.phar install" :
+ exec { "sudo -u \"www-data\" php composer.phar install" :
cwd => "/home/${globalUser}/kateglo",
creates => "/home/${globalUser}/kateglo/vendor",
- user => "www-data",
- group => "www-data",
timeout => 0,
logoutput => true,
require => [Package["php5"],Exec["get composer"]],
@@ -224,6 +222,7 @@

exec {"wait for jetty":
require => Service["jetty"],
+ subscribe => Service["jetty"],
command => "wget --spider --tries 10 --retry-connrefused
--no-check-certificate http://localhost:8080/solr/",
}

=======================================
--- /branches/kateglox/vagrant/puppet/modules/mysql/manifests/init.pp Fri
Jul 27 05:44:43 2012
+++ /branches/kateglox/vagrant/puppet/modules/mysql/manifests/init.pp Tue
Jul 31 03:08:40 2012
@@ -33,10 +33,11 @@
if $mysqlUser != "" {
if $mysqlUserPassword != "" {
exec { "create user":
- unless => "mysqladmin -u${mysqlUser} ${mysqlAddPassword}
status",
+ unless => "mysqladmin -u${mysqlUser}
-p\"${mysqlUserPassword}\" status",
command => "mysql -u root -p\"${mysqlRootPassword}\" -e
\"create user ${mysqlUser} identified by ${mysqlUserPassword};\"",
group => "root",
user => "root",
+ logoutput => true,
require => [Service["mysql"], Package["mysql-server"],
Exec["set-mysql-root-password"]],
}
}