Merge pull request #113 from thomasmeeus/master

Fix & update mod_jk recipe

Author: Roderik van der Veer

recipes/mod_jk.rb

@@ -2,23 +2,23 @@
     when 'mac_os_x'
         unless File.exists?("/usr/libexec/apache2/mod_jk.so")
 
-          remote_file "#{Chef::Config[:file_cache_path]}/tomcat-connectors-1.2.37-src.tar.gz" do
-            source "http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz"
+          remote_file "#{Chef::Config[:file_cache_path]}/tomcat-connectors-1.2.40-src.tar.gz" do
+            source "http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz"
             owner node['current_user']
           end
 
           execute "extract tomcat-connectors" do
-            command "tar vxzf #{Chef::Config[:file_cache_path]}/tomcat-connectors-1.2.37-src.tar.gz -C #{Chef::Config[:file_cache_path]}/"
+            command "tar vxzf #{Chef::Config[:file_cache_path]}/tomcat-connectors-1.2.40-src.tar.gz -C #{Chef::Config[:file_cache_path]}/"
             user node['current_user']
           end
 
           execute "symlink Xcode" do
-            command "cd /Applications/Xcode.app/Contents/Developer/Toolchains;sudo ln -s XcodeDefault.xctoolchain OSX10.8.xctoolchain"
+            command "cd /Applications/Xcode.app/Contents/Developer/Toolchains;sudo ln -s XcodeDefault.xctoolchain OSX10.10.xctoolchain"
           end
 
           bash "install_program" do
             user "root"
-            cwd "#{Chef::Config[:file_cache_path]}/tomcat-connectors-1.2.37-src/native"
+            cwd "#{Chef::Config[:file_cache_path]}/tomcat-connectors-1.2.40-src/native"
             code <<-EOH
                 ./configure --with-apxs=/usr/sbin/apxs
                 make
@@ -36,6 +36,10 @@
             action :create
             recursive true
         end
+        
+        template "/etc/apache2/other/000-modjk.conf" do
+            source "apache/jk.conf.erb"
+        end
     when 'debian'
         Chef::Log.debug("This recipe is OSX only")
 end

recipes/skylab.rb

@@ -78,13 +78,13 @@
     not_if do ::File.exists?("#{dblocation}/.grant-postgresql-skylab-user-success") end
 end
 
-#git "/opt/skylab" do
-#    repository "https://github.com/Kunstmaan/skylab.git"
-#    user node['current_user']
-#    reference "master"
-#    enable_checkout false
-#    action :sync
-#end
+git "/opt/skylab" do
+    repository "https://github.com/Kunstmaan/skylab.git"
+    user node['current_user']
+    reference "master"
+    enable_checkout false
+    action :sync
+end
 
 execute "get-skylab" do
     user node['current_user']
@@ -95,3 +95,12 @@
     cwd "/usr/local/bin/"
     command "mv skylab.phar /usr/local/bin/skylab"
 end
+
+link '/opt/jdk/default' do
+  to '/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home'
+  user 'root'
+end
+
+template "/etc/skylab.yml" do
+    source "skylab.yml.erb"
+end

templates/default/skylab.yml.erb

@@ -0,0 +1,66 @@
+projects:
+    path:       "/home/projects"
+    backuppath: "/home/backupped-projects"
+
+users:
+    superuser:      root
+    supergroup:     root
+    wwwuser:        nginx
+    postgresuser:   postgres
+
+apache:
+    admin:        support@kunstmaan.be
+    vhostdir:     /etc/apache2/conf/projects.d
+
+nginx:
+    sitesavailable: /etc/nginx/sites-available
+    sitesenabled:   /etc/nginx/sites-enabled
+    port:           80
+
+webserver:
+    engine: apache
+    hostmachine:    dev.kunstmaan.be
+
+php:
+    slowlog_timeout: 10s
+
+awstats:
+    password: password
+
+mysql:
+    user:     root
+    password: password
+
+postgresql:
+    user:     skylab
+    password: password
+
+pingdom:
+    username:
+    password:
+    token:
+    contactids:
+
+skeletons:
+    base:       Kunstmaan\Skylab\Skeleton\BaseSkeleton
+    mysql:      Kunstmaan\Skylab\Skeleton\MySQLSkeleton
+    apache:     Kunstmaan\Skylab\Skeleton\WebserverSkeleton
+    nginx:      Kunstmaan\Skylab\Skeleton\WebserverSkeleton
+    php5:       Kunstmaan\Skylab\Skeleton\PHPSkeleton
+    symfony:    Kunstmaan\Skylab\Skeleton\SymfonySkeleton
+    awstats:    false # with varnish this is useless
+    anacron:    Kunstmaan\Skylab\Skeleton\AnacronSkeleton
+    fcron:      false # We only support anacron at this point
+    logrotate:  false # Full functionality has been replaced by the Skylab chef cookbook
+    nagios:     false # We no longer use Nagios to monitor our websites
+    mon:        false # We no longer use Mon to monitor our websites
+    pingdom:    Kunstmaan\Skylab\Skeleton\PingdomSkeleton
+    postgres:   Kunstmaan\Skylab\Skeleton\PostgreSQLSkeleton
+    tomcat:     Kunstmaan\Skylab\Skeleton\TomcatSkeleton
+    smartcms:   Kunstmaan\Skylab\Skeleton\JavaSkeleton
+    mongo:      false
+    dailycron:  false
+    solr:       false
+
+debug: true
+develmode: true