osqa: disable unused mysqlfulltext module

[chef.git] / cookbooks / osqa / recipes / default.rb

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 72534683e669240507c5f58ac15849e2f4f8cd23..2c924332fe4f19b4185989add22e7d340e77d3ee 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -29,18 +29,15 @@ package "libpq-dev"
 
 python_directory = "/opt/osqa-python"
 
 
 python_directory = "/opt/osqa-python"
 

-python_virtualenv python_directory
+python_virtualenv python_directory do
+  interpreter "/usr/bin/python2"
+end

 
 python_package "Django" do
   python_virtualenv python_directory
   version "1.6.11"
 end
 
 
 python_package "Django" do
   python_virtualenv python_directory
   version "1.6.11"
 end
 

-python_package "html5lib" do
-  python_virtualenv python_directory
-  version "0.999"
-end
-

 python_package "Markdown" do
   python_virtualenv python_directory
   version "2.4"
 python_package "Markdown" do
   python_virtualenv python_directory
   version "2.4"


@@ -56,11 +53,6 @@ python_package "python-openid" do
   version "2.2.5"
 end
 
   version "2.2.5"
 end
 

-python_package "MySQL-python" do
-  python_virtualenv python_directory
-  version "1.2.3"
-end
-

 python_package "psycopg2" do
   python_virtualenv python_directory
   version "2.7.6.1"
 python_package "psycopg2" do
   python_virtualenv python_directory
   version "2.7.6.1"


@@ -71,6 +63,11 @@ python_package "South" do
   version "0.7.6"
 end
 
   version "0.7.6"
 end
 

+python_package "html5lib" do
+  python_virtualenv python_directory
+  version "0.999"
+end
+

 apache_module "rewrite"
 apache_module "wsgi"
 
 apache_module "rewrite"
 apache_module "wsgi"
 


@@ -101,7 +98,7 @@ node[:osqa][:sites].each do |site|
   directory directory do
     owner site_user
     group site_group
   directory directory do
     owner site_user
     group site_group

-    mode 0o755
+    mode "755"

   end
 
   execute "osqa-migrate" do
   end
 
   execute "osqa-migrate" do


@@ -126,14 +123,14 @@ node[:osqa][:sites].each do |site|
   directory "#{directory}/upfiles" do
     user site_user
     group site_group
   directory "#{directory}/upfiles" do
     user site_user
     group site_group

-    mode 0o755
+    mode "755"

   end
 
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group
   end
 
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group

-    mode 0o644
+    mode "644"

     variables :directory => directory
     notifies :reload, "service[apache2]"
   end
     variables :directory => directory
     notifies :reload, "service[apache2]"
   end


@@ -147,7 +144,7 @@ node[:osqa][:sites].each do |site|
     line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'")
     line.gsub!(%r{^APP_URL = 'http://'}, "APP_URL = 'https://#{site_name}'")
     line.gsub!(%r{^TIME_ZONE = 'America/New_York'}, "TIME_ZONE = 'Europe/London'")
     line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'")
     line.gsub!(%r{^APP_URL = 'http://'}, "APP_URL = 'https://#{site_name}'")
     line.gsub!(%r{^TIME_ZONE = 'America/New_York'}, "TIME_ZONE = 'Europe/London'")

-    line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']")
+    line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth', 'mysqlfulltext']")

 
     line
   end
 
     line
   end


@@ -155,7 +152,7 @@ node[:osqa][:sites].each do |site|
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group

-    mode 0o644
+    mode "644"

     content settings
     notifies :reload, "service[apache2]"
   end
     content settings
     notifies :reload, "service[apache2]"
   end


@@ -164,7 +161,7 @@ node[:osqa][:sites].each do |site|
     source "backup.cron.erb"
     owner "root"
     group "root"
     source "backup.cron.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
   end
 end
     variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
   end
 end