Revision: 496
Author: arthur.purnama
Date: Tue Jul 31 10:36:42 2012
Log: Making Puppet configurable
http://code.google.com/p/kateglo/source/detail?r=496
Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp
=======================================
--- /branches/kateglox/.idea/workspace.xml Tue Jul 31 06:06:30 2012
+++ /branches/kateglox/.idea/workspace.xml Tue Jul 31 10:36:42 2012
@@ -37,7 +37,7 @@
<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="233" column="41" selection-start="8457"
selection-end="8457" vertical-scroll-proportion="0.65384614">
+ <state line="244" column="120" selection-start="9355"
selection-end="9355" vertical-scroll-proportion="1.0680473">
<folding />
</state>
</provider>
@@ -55,7 +55,7 @@
<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="-4.576923">
+ <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -82,7 +82,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="35" column="68" selection-start="943"
selection-end="943" vertical-scroll-proportion="-9.2">
+ <state line="35" column="68" selection-start="943"
selection-end="943" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -195,6 +195,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>
@@ -487,16 +497,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>
@@ -505,8 +505,8 @@
<property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="options.lastSelected" value="web.server" />
- <property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
</component>
<component name="PublishConfig" serverName="kateglo-vagrant"
serverId="5947b0bc-2fa8-46b7-b5d6-2f09f74c0bdc" autoUpload="true">
<servers>
@@ -671,7 +671,11 @@
<created>1343735281103</created>
<updated>1343735281103</updated>
</task>
- <option name="localTasksCounter" value="17" />
+ <task id="LOCAL-00017" summary="Making Puppet configurable">
+ <created>1343739994103</created>
+ <updated>1343739994103</updated>
+ </task>
+ <option name="localTasksCounter" value="18" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@@ -698,23 +702,23 @@
<frame x="-8" y="-8" width="1382" height="754" extended-state="6" />
<editor active="false" />
<layout>
- <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="File Transfer" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
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.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.22348484" 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="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="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="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="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="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="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.21969697" sideWeight="0.6750842" order="0" side_tool="false"
content_ui="combo" />
+ <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="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.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" />
@@ -821,59 +825,51 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/initializr/index.html">
<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>
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.0" />
+ <state line="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
+ <entry file="file://$PROJECT_DIR$/public/index.php">
<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="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
<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">
- <folding />
- </state>
+ <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/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>
+ <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/templates/application.ini.erb">
+ <entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/index.php">
+ <entry file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="-4.576923">
- <folding />
- </state>
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="68" selection-start="943"
selection-end="943" vertical-scroll-proportion="-9.2">
+ <state line="35" column="68" selection-start="943"
selection-end="943" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="233" column="41" selection-start="8457"
selection-end="8457" vertical-scroll-proportion="0.65384614">
+ <state line="244" column="120" selection-start="9355"
selection-end="9355" vertical-scroll-proportion="1.0680473">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 06:06:30 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 10:36:42 2012
@@ -242,7 +242,7 @@
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"], Exec["restart jetty"]],
+ Exec["import kateglo dump"], Service["jetty"], Exec["wait for
jetty"], Exec["restart jetty"], Service["mysql"]],
}