[devsetup] memcached statically linked to libevent, disable sasl

Change-Id: Idb8bfd06276c19f69c3fa7b5f44d9fea5196adce
cloudfoundry-attic · May 22, 2012 · 651f270 · 651f270
1 parent 1ac418e
commit 651f270
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/dev_setup/cookbooks/memcached/recipes/default.rb b/dev_setup/cookbooks/memcached/recipes/default.rb
@@ -41,24 +41,13 @@
   end
 end
 
-bash "Install and configure sasldb" do
-  user node[:deployment][:user]
-  code <<-EOH
-  sudo apt-get install sasl2-bin libsasl2-dev -y
-  sudo sed -i 's/START=no/START=yes/' /etc/default/saslauthd
-  sudo /etc/init.d/saslauthd start
-  echo "password" | saslpasswd2 -c -a test testuser -p
-  sudo chown #{node[:deployment][:user]} /etc/sasldb2
-  EOH
-end
-
 bash "Install memcached" do
   cwd File.join("", "tmp")
   user node[:deployment][:user]
   code <<-EOH
   tar xzf memcached-#{node[:memcached][:version]}.tar.gz
   cd memcached-#{node[:memcached][:version]}
-  ./configure --enable-sasl --with-libevent=../libevent-#{node[:libevent][:version]}-stable/tmp
+  ./configure --with-libevent=../libevent-#{node[:libevent][:version]}-stable/tmp LDFLAGS="-static"
   make
   cp memcached #{File.join(node[:memcached][:path], "bin")}
   EOH

diff --git a/dev_setup/cookbooks/memcached/templates/default/memcached_node.yml.erb b/dev_setup/cookbooks/memcached/templates/default/memcached_node.yml.erb
@@ -16,3 +16,4 @@ logging:
   level: debug
 memcached_memory: 16
 max_clients: 1024
+sasl_enabled: false