From 651f27021c7c4f29b76b53d7031478a0a05ef1dc Mon Sep 17 00:00:00 2001 From: Harshawardhan Gadgil Date: Tue, 22 May 2012 11:14:06 -0700 Subject: [PATCH] [devsetup] memcached statically linked to libevent, disable sasl Change-Id: Idb8bfd06276c19f69c3fa7b5f44d9fea5196adce --- dev_setup/cookbooks/memcached/recipes/default.rb | 13 +------------ .../templates/default/memcached_node.yml.erb | 1 + 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dev_setup/cookbooks/memcached/recipes/default.rb b/dev_setup/cookbooks/memcached/recipes/default.rb index 9962a58..eb53de0 100644 --- a/dev_setup/cookbooks/memcached/recipes/default.rb +++ b/dev_setup/cookbooks/memcached/recipes/default.rb @@ -41,24 +41,13 @@ bash "Compile libevent" do 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 index c7f6bea..369073d 100644 --- 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