[kateglo] r499 committed - Making Puppet configurable
1 view
Skip to first unread message
kat...@googlecode.com
Aug 2, 2012, 11:50:25 AM8/2/12
to kat...@googlegroups.com
Revision: 499
Author: arthur.purnama
Date: Thu Aug 2 08:50:12 2012
Log: Making Puppet configurable
http://code.google.com/p/kateglo/source/detail?r=499
Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp
=======================================
--- /branches/kateglox/.idea/workspace.xml Tue Jul 31 11:50:10 2012
+++ /branches/kateglox/.idea/workspace.xml Thu Aug 2 08:50:12 2012
@@ -4,6 +4,7 @@
<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$/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/solr/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -24,89 +25,7 @@
<favorites_list name="kateglo" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="index.html" pinned="false" current="false"
current-in-tab="false">
- <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>
- </provider>
- </entry>
- </file>
- <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="237" column="46" selection-start="8616"
selection-end="8616" vertical-scroll-proportion="0.3164179">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="application.ini.erb" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
- <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>
- </provider>
- </entry>
- </file>
- <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.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="0" column="0" selection-start="0"
selection-end="0" 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="0" column="0" selection-start="0"
selection-end="0" 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/mysql/manifests/init.pp">
- <provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="humans.txt" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="crossdomain.xml" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
- <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>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -120,7 +39,6 @@
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf" />
<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" />
@@ -132,6 +50,7 @@
<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" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
</list>
</option>
</component>
@@ -195,16 +114,6 @@
<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>
@@ -497,6 +406,30 @@
<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="build" />
+ <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>
@@ -707,7 +640,11 @@
<created>1343758049102</created>
<updated>1343758049102</updated>
</task>
- <option name="localTasksCounter" value="20" />
+ <task id="LOCAL-00020" summary="Making Puppet configurable">
+ <created>1343760614102</created>
+ <updated>1343760614102</updated>
+ </task>
+ <option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@@ -734,23 +671,23 @@
<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="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="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="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.23106061" 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="true"
weight="0.32996634" 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.22348484" sideWeight="0.6700337" 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.32996634" 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" />
@@ -820,11 +757,6 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/application/configs/application.ini">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="62" selection-start="1256"
selection-end="1256" vertical-scroll-proportion="0.92021275" />
- </provider>
- </entry>
<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.046831954" />
@@ -862,12 +794,14 @@
</entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
<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="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.045212764">
+ <folding />
+ </state>
</provider>
</entry>
<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.0">
+ <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.04857143">
<folding />
</state>
</provider>
@@ -882,9 +816,18 @@
<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="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.3443526">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
<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="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.045212764">
+ <folding />
+ </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
@@ -892,16 +835,16 @@
<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/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.0">
+ <state line="229" column="23" selection-start="8051"
selection-end="8056" vertical-scroll-proportion="-19.32">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="237" column="46" selection-start="8616"
selection-end="8616" vertical-scroll-proportion="0.3164179">
+ <state line="73" column="127" selection-start="2588"
selection-end="2588" vertical-scroll-proportion="0.68945867">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 11:50:10 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Thu
Aug 2 08:50:12 2012
@@ -79,15 +79,28 @@
notify => Exec["import kateglo dump"],
}
- exec { "import kateglo dump":
- refreshonly => true,
- command => "mysql -u root -p\"${mysqlRootPassword}\" kateglox <
kateglox.sql",
- cwd => "/home/${globalUser}/",
- group => "root", user => "root",
- logoutput => true,
- timeout => 0,
- require => File["/home/${globalUser}/kateglox.sql"],
- subscribe => File["/home/${globalUser}/kateglox.sql"],
+ if $mysqlRootPassword != "" {
+ exec { "import kateglo dump":
+ refreshonly => true,
+ command => "mysql -u root -p\"${mysqlRootPassword}\" kateglox
< kateglox.sql",
+ cwd => "/home/${globalUser}/",
+ group => "root", user => "root",
+ logoutput => true,
+ timeout => 0,
+ require => File["/home/${globalUser}/kateglox.sql"],
+ subscribe => File["/home/${globalUser}/kateglox.sql"],
+ }
+ } else {
+ exec { "import kateglo dump":
+ 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"],
+ subscribe => File["/home/${globalUser}/kateglox.sql"],
+ }
}
# ServerAdmin webmaster@localhost
=======================================
--- /branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp Fri
Jul 27 05:44:43 2012
+++ /branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp Thu
Aug 2 08:50:12 2012
@@ -69,6 +69,7 @@
file { "/home/${globalUser}/solr":
ensure => directory,
recurse => inf,
+ refreshonly => true,
owner => "jetty",
group => "jetty",
require => Exec["solr move"]
Author: arthur.purnama
Date: Thu Aug 2 08:50:12 2012
Log: Making Puppet configurable
http://code.google.com/p/kateglo/source/detail?r=499
Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp
/branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp
=======================================
--- /branches/kateglox/.idea/workspace.xml Tue Jul 31 11:50:10 2012
+++ /branches/kateglox/.idea/workspace.xml Thu Aug 2 08:50:12 2012
@@ -4,6 +4,7 @@
<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$/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/solr/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -24,89 +25,7 @@
<favorites_list name="kateglo" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="index.html" pinned="false" current="false"
current-in-tab="false">
- <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>
- </provider>
- </entry>
- </file>
- <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="237" column="46" selection-start="8616"
selection-end="8616" vertical-scroll-proportion="0.3164179">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="application.ini.erb" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
- <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>
- </provider>
- </entry>
- </file>
- <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.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="0" column="0" selection-start="0"
selection-end="0" 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="0" column="0" selection-start="0"
selection-end="0" 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/mysql/manifests/init.pp">
- <provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="humans.txt" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="crossdomain.xml" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
- <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>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -120,7 +39,6 @@
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf" />
<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" />
@@ -132,6 +50,7 @@
<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" />
+ <option
value="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
</list>
</option>
</component>
@@ -195,16 +114,6 @@
<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>
@@ -497,6 +406,30 @@
<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="build" />
+ <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>
@@ -707,7 +640,11 @@
<created>1343758049102</created>
<updated>1343758049102</updated>
</task>
- <option name="localTasksCounter" value="20" />
+ <task id="LOCAL-00020" summary="Making Puppet configurable">
+ <created>1343760614102</created>
+ <updated>1343760614102</updated>
+ </task>
+ <option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@@ -734,23 +671,23 @@
<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="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="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="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.23106061" 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="true"
weight="0.32996634" 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.22348484" sideWeight="0.6700337" 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.32996634" 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" />
@@ -820,11 +757,6 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/application/configs/application.ini">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="62" selection-start="1256"
selection-end="1256" vertical-scroll-proportion="0.92021275" />
- </provider>
- </entry>
<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.046831954" />
@@ -862,12 +794,14 @@
</entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
<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="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.045212764">
+ <folding />
+ </state>
</provider>
</entry>
<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.0">
+ <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.04857143">
<folding />
</state>
</provider>
@@ -882,9 +816,18 @@
<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="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.3443526">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
<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="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.045212764">
+ <folding />
+ </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
@@ -892,16 +835,16 @@
<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/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.0">
+ <state line="229" column="23" selection-start="8051"
selection-end="8056" vertical-scroll-proportion="-19.32">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="237" column="46" selection-start="8616"
selection-end="8616" vertical-scroll-proportion="0.3164179">
+ <state line="73" column="127" selection-start="2588"
selection-end="2588" vertical-scroll-proportion="0.68945867">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 11:50:10 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Thu
Aug 2 08:50:12 2012
@@ -79,15 +79,28 @@
notify => Exec["import kateglo dump"],
}
- exec { "import kateglo dump":
- refreshonly => true,
- command => "mysql -u root -p\"${mysqlRootPassword}\" kateglox <
kateglox.sql",
- cwd => "/home/${globalUser}/",
- group => "root", user => "root",
- logoutput => true,
- timeout => 0,
- require => File["/home/${globalUser}/kateglox.sql"],
- subscribe => File["/home/${globalUser}/kateglox.sql"],
+ if $mysqlRootPassword != "" {
+ exec { "import kateglo dump":
+ refreshonly => true,
+ command => "mysql -u root -p\"${mysqlRootPassword}\" kateglox
< kateglox.sql",
+ cwd => "/home/${globalUser}/",
+ group => "root", user => "root",
+ logoutput => true,
+ timeout => 0,
+ require => File["/home/${globalUser}/kateglox.sql"],
+ subscribe => File["/home/${globalUser}/kateglox.sql"],
+ }
+ } else {
+ exec { "import kateglo dump":
+ 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"],
+ subscribe => File["/home/${globalUser}/kateglox.sql"],
+ }
}
# ServerAdmin webmaster@localhost
=======================================
--- /branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp Fri
Jul 27 05:44:43 2012
+++ /branches/kateglox/vagrant/puppet/modules/solr/manifests/init.pp Thu
Aug 2 08:50:12 2012
@@ -69,6 +69,7 @@
file { "/home/${globalUser}/solr":
ensure => directory,
recurse => inf,
+ refreshonly => true,
owner => "jetty",
group => "jetty",
require => Exec["solr move"]
Reply all
Reply to author
Forward
0 new messages