cluster 0.7.4 → 0.7.5

Sign up to get free protection for your applications and to get access to all the features.
data/instance_setup.sh CHANGED
@@ -19,6 +19,7 @@ zip
19
19
  libapache2-mod-apreq2
20
20
  apache2-mpm-worker
21
21
  apache2-threaded-dev
22
+ libapache2-mod-xsendfile
22
23
  libapr1-dev
23
24
  libaprutil1-dev
24
25
  help2man
@@ -140,15 +141,18 @@ EOF
140
141
  # CouchDB was starting in 2, 3, 4, 5 and killed in 0, 6, 1
141
142
  for s in apache2 memcached couchdb nginx; do sudo update-rc.d -f $s remove; done
142
143
 
144
+ ### MEMCACHE
145
+ # FIXME !! we need to fix the /etc/memcached.conf so that it has the local IP address
146
+
143
147
  ### MYSQL
144
148
  sed -i '/^datadir.*=/ s@=.*@= /mnt/databases/mysql@' /etc/mysql/my.cnf
145
149
  sed -i 's/^bind-address/#bind-address' /etc/mysql/my.cnf
146
- # !! NEED to deal with apparmor and my.cnf being different
150
+ # FIXME !! NEED to deal with apparmor and my.cnf being different
147
151
  mv /etc/init/mysql.conf /root/mysql.conf.orig
148
152
 
149
153
  ## COUCHDB
150
154
  local_addr=$(/sbin/ifconfig eth0 | awk -F"[: ]+" 'NR==2 {print $4}')
151
- couch_data=/mnt/databases/couchdb/1.0.1
155
+ couch_data=/mnt/databases/couchdb/1.2.0
152
156
  couch_conf=/etc/couchdb/local.ini
153
157
 
154
158
  mkdir -p ${couch_data}/log
@@ -172,7 +176,10 @@ file = ${couch_data}/log/couch.log
172
176
  algorithm = utc_random
173
177
 
174
178
  [couch_httpd_auth]
175
- ; require_valid_user true
179
+ ; require_valid_user
180
+
181
+ [compactions]
182
+ _default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "05:00"}, {to, "10:00"}]
176
183
  EOF
177
184
  chown couchdb:couchdb ${couch_conf}
178
185
  chmod 664 ${couch_conf}
@@ -388,13 +388,13 @@ class Amazon < Infrastructure
388
388
  def sss(o = nil)
389
389
  params = connection_params o
390
390
  params.delete :region
391
- @sqs ||= RightAws::ElbInterface.new(key, secret, params)
391
+ @sqs ||= RightAws::S3.new(key, secret, params)
392
392
  end
393
393
 
394
394
  def sqs(o = nil)
395
395
  params = connection_params o
396
396
  @sqs ||= {}
397
- @sqs[params[:region]] ||= RightAws::ElbInterface.new(key, secret, params)
397
+ @sqs[params[:region]] ||= RightAws::SqsGen2.new(key, secret, params)
398
398
  end
399
399
 
400
400
  def elb(o = nil)
@@ -5,7 +5,7 @@ class Cluster
5
5
 
6
6
  class << self
7
7
  def version
8
- '0.7.4'
8
+ '0.7.5'
9
9
  end
10
10
  end
11
11
  end
data/user_data_web.sh CHANGED
@@ -1,6 +1,7 @@
1
1
  #!/bin/bash
2
2
  FRIENDLY=noble
3
3
  SERVICES=web
4
+ PASSPHRASE='nope'
4
5
 
5
6
  CLUSTER_USER=ubuntu
6
7
  CLUSTER_DIR=/home/${CLUSTER_USER}/.cluster
@@ -83,6 +84,10 @@ else
83
84
  su -l ${user} -c "cd ${cache}; git checkout -q -b deploy ${branch}"
84
85
  fi
85
86
 
87
+ mkdir ${cache}/tmp
88
+ echo ${PASSPHRASE} >> ${cache}/tmp/.gpg_passphrase
89
+ chmod 400 ${cache}/tmp/.gpg_passphrase
90
+
86
91
  su -l ${user} -c "cd ${cache}; export NO_CAPS=true; APP_HOME=${cache}; cap local deploy:setup && cap local deploy"
87
92
 
88
93
  ${CLUSTER} instance_state httpd
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cluster
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.4
4
+ version: 0.7.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-13 00:00:00.000000000 Z
12
+ date: 2013-01-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: uuidtools