<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -72,7 +72,8 @@ cd /tmp
 # Upgrade/install packages
 apt-get -y update
 # some basics
-apt-get install --yes --force-yes -q wget unzip cron rsync
+apt-get install --yes --force-yes -q wget unzip cron rsync python-setuptools
+
 
 if [ $SERVER_ROLE = &quot;all&quot; ] || [ $SERVER_ROLE = &quot;db&quot; ] 
 then</diff>
      <filename>install/install.sh</filename>
    </modified>
    <modified>
      <diff>@@ -6,32 +6,49 @@
 # TODO:  separate these or allow override as certmaster
 #           isn't need on slaves
 # -----------------------------------------------------
-cd /tmp
-apt-get install openssl
+ENV=&quot;dev&quot;
+
+# http://ubuntu-tutorials.com/2007/11/13/service-tool-available-on-ubuntu-710/
+# http://ubuntuforums.org/archive/index.php/t-20583.html
+apt-get install --yes --force-yes -q openssl sysvconfig sysv-rc-conf
 easy_install pyopenssl
+
+cd /tmp
+#for some reason the make install of git repository doesn't install certmaster?
 wget http://people.fedoraproject.org/~alikins/files/certmaster/certmaster-0.24.tar.gz
 tar -xzvf certmaster*.tar.gz
 rm cert*.tar.gz
 cd cert*
 python setup.py install
 cd /tmp
-rm -rf certmaster-*
-wget http://people.fedoraproject.org/~alikins/files/func/func-0.24.tar.gz
-tar -xzvf func*.tar.gz
-rm func*.tar.gz
-cd func*
-python setup.py install
-cd /tmp
-rm -rf func-*
-#make install
+rm -rf certmaster-* 
+
+if [ $ENV = &quot;dev&quot; ] ; then
+    cd /home/demisauce
+    apt-get install --yes --force-yes -q make
+    git clone git://github.com/araddon/func.git 
+    make install
+else
+    wget http://people.fedoraproject.org/~alikins/files/func/func-0.24.tar.gz
+    tar -xzvf func*.tar.gz
+    rm func*.tar.gz
+    cd func*
+    python setup.py install
+    cd /tmp
+    rm -rf func-*
+    #make install
+fi
 
+# edit the /etc/certmaster/minion.conf to name of certmaster?
+#perl -pi -e s/Deny\ from\ all/\#Deny\ from\ all/g /etc/certmaster/minion.conf || echo &quot;&quot;
+# or edit /etc/hosts to add name of certmaster if this box?  
+# /etc/init.d/networking restart
 
 # start certmaster:
 #/etc/init.d/certmaster start
 update-rc.d certmaster defaults
 invoke-rc.d certmaster start
 
-# edit the minion.conf
 update-rc.d funcd defaults
 invoke-rc.d funcd start
 </diff>
      <filename>install/install_func.sh</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d3f2972aca0eb45433f26502fff8d276c4e797c7</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Raddon</name>
    <email>araddon@yahoo.com</email>
  </author>
  <url>http://github.com/araddon/demisauce/commit/51a50ee74d5a1df7dab3b16a4b6fb0a19bcc48c8</url>
  <id>51a50ee74d5a1df7dab3b16a4b6fb0a19bcc48c8</id>
  <committed-date>2009-02-16T12:11:51-08:00</committed-date>
  <authored-date>2009-02-16T12:11:51-08:00</authored-date>
  <message>working on func installer</message>
  <tree>8ed3f43efadf8892a306f9088fa122b7e110abf4</tree>
  <committer>
    <name>Aaron Raddon</name>
    <email>araddon@yahoo.com</email>
  </committer>
</commit>
