wakame 0.4.2 → 0.5.0

data/wakame_generators/resource/templates/apache_app/conf/system-app.conf

@@ -36,7 +36,7 @@ LoadModule info_module /usr/lib/apache2/modules/mod_info.so
 LoadModule passenger_module /usr/local/gems/gems/passenger-2.2.1/ext/apache2/mod_passenger.so
 
 ### Port configuration
-Listen <%= property.listen_port %>
+Listen <%= resource.listen_port %>
 
 #<IfModule mod_ssl.c>
 #    Listen 443

data/wakame_generators/resource/templates/apache_app/conf/vh/aaa.test.conf

@@ -0,0 +1,9 @@
+<VirtualHost *:<%= resource.listen_port %>>
+ServerName aaa.test
+DocumentRoot /home/wakame/apps/development/test/public
+RailsEnv development
+
+LogLevel warn
+CustomLog /var/log/apache2/access-app.log combined
+ErrorLog /var/log/apache2/error-app.log
+</VirtualHost>

data/wakame_generators/resource/templates/apache_lb/apache_lb.rb

@@ -1,34 +1,35 @@
-
-require 'wakame/rule'
-
 class Apache_LB < Wakame::Service::Resource
-  include WebCluster::HttpLoadBalanceServer
-  include Wakame::Service::ApacheBasicProps
+  include HttpServer
   
-  def_attribute :listen_port, {:default=>80}
-  def_attribute :listen_port_https, {:default=>443}
+  property :listen_port, {:default=>80}
+  property :listen_port_https, {:default=>443}
   
   def render_config(template)
-    template.cp(%w(conf/envvars-lb init.d/apache2-lb))
-    template.render(%w(conf/system-lb.conf conf/apache2.conf conf/sites-lb.conf))
+    template.glob_basedir(%w(conf/envvars-lb init.d/apache2-lb)) { |d|
+      template.cp(d)
+    }
+    template.glob_basedir(%w(conf/system-lb.conf conf/apache2.conf conf/vh/*.conf)) { |d|
+      template.render(d)
+    }
     template.chmod("init.d/apache2-lb", 0755)
   end
 
   def on_parent_changed(svc, action)
-    Wakame::Rule::BasicActionSet.deploy_configuration(svc)
+    action.trigger_action(Wakame::Actions::DeployConfig.new(svc))
+    action.flush_subactions
     reload(svc, action)
   end
 
   def start(svc, action)
     cond = ConditionalWait.new { |cond|
       cond.wait_event(Wakame::Event::ServiceOnline) { |event|
-        event.instance_id == svc.instance_id
+        event.instance_id == svc.id
       }
     }
 
-    request = action.actor_request(svc.agent.agent_id,
-                                   '/service_monitor/register', svc.instance_id, :pidfile, '/var/run/apache2-lb.pid').request
-    action.actor_request(svc.agent.agent_id,
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/service_monitor/register', svc.id, :pidfile, '/var/run/apache2-lb.pid').request
+    action.actor_request(svc.cloud_host.agent_id,
                          '/daemon/start', "apache_lb", 'init.d/apache2-lb'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process started")
@@ -40,11 +41,11 @@ class Apache_LB < Wakame::Service::Resource
   def stop(svc, action)
     cond = ConditionalWait.new { |cond|
       cond.wait_event(Wakame::Event::ServiceOffline) { |event|
-        event.instance_id == svc.instance_id
+        event.instance_id == svc.id
       }
     }
 
-    action.actor_request(svc.agent.agent_id,
+    action.actor_request(svc.cloud_host.agent_id,
                          '/daemon/stop', 'apache_lb', 'init.d/apache2-lb'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process stopped")
@@ -52,15 +53,15 @@ class Apache_LB < Wakame::Service::Resource
 
     cond.wait
 
-    request = action.actor_request(svc.agent.agent_id,
-                                   '/service_monitor/unregister', svc.instance_id ).request
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/service_monitor/unregister', svc.id ).request
   end
 
   def reload(svc, action)
-    action.actor_request(svc.agent.agent_id,
+    action.actor_request(svc.cloud_host.agent_id,
                          '/daemon/reload', "apache_lb", 'init.d/apache2-lb'){ |req|
       req.wait
-      Wakame.log.debug("#{self.class} process stopped")
+      Wakame.log.debug("#{self.class} process reloaded")
     }
   end
   

data/wakame_generators/resource/templates/apache_lb/conf/apache2.conf

@@ -1,6 +1,6 @@
 #ServerRoot "/etc/apache2"
 #ServerRoot "/home/wakame/config/apache2"
-ServerRoot "<%= agent.root_path %>/tmp/config/apache_lb/conf"
+ServerRoot "<%= cloud_host.agent.root_path %>/tmp/config/apache_lb/conf"
 
 LockFile /var/lock/apache2/accept.lock
 PidFile ${APACHE_PID_FILE}
@@ -43,4 +43,16 @@ LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 </IfModule>
 
-Include ${SITES_INCLUDE_FILE}
+NameVirtualHost *:<%= resource.listen_port %>
+
+# Wild Card Virtual Host
+#<VirtualHost *:<%= resource.listen_port %>>
+#DocumentRoot /var/www
+#
+#LogLevel warn
+#CustomLog /var/log/apache2/access-lb.log combined
+#ErrorLog /var/log/apache2/error-lb.log
+#
+#</VirtualHost>
+
+Include vh/*.conf

data/wakame_generators/resource/templates/apache_lb/conf/system-lb.conf

@@ -40,10 +40,10 @@ LoadModule proxy_balancer_module /usr/lib/apache2/modules/mod_proxy_balancer.so
 
 
 ### Port configuration
-Listen <%= property.listen_port %>
+Listen <%= resource.listen_port %>
 
 <IfModule mod_ssl.c>
-    Listen <%= property.listen_port_https %>
+    Listen <%= resource.listen_port_https %>
 </IfModule>
 
 
@@ -73,3 +73,18 @@ Listen <%= property.listen_port %>
 #    Allow from 127.0.0.1 localhost.localdomain localhost ip6-localhost
 #</Location>
 #</IfModule>
+
+<Proxy balancer://cluster-www>
+  <%- service_cluster.each_instance(HttpAssetServer) { |n| 
+        next if n.status != STATUS_ONLINE
+  -%>
+  BalancerMember http://<%= n.cloud_host.agent_ip %>:<%= n.resource.listen_port %> loadfactor=10
+  <%- } -%>
+</Proxy>
+<Proxy balancer://cluster-app>
+  <%- service_cluster.each_instance(HttpApplicationServer) { |n|
+        next if n.status != STATUS_ONLINE
+  -%>
+  BalancerMember http://<%= n.cloud_host.agent_ip %>:<%= n.resource.listen_port %> loadfactor=10
+  <%- } -%>
+</Proxy>

data/wakame_generators/resource/templates/apache_lb/conf/vh/aaa.test.conf

@@ -0,0 +1,37 @@
+<VirtualHost *:<%= resource.listen_port %>>
+  ServerName aaa.test
+  DocumentRoot /var/www/
+
+  LogLevel warn
+  CustomLog /var/log/apache2/aaa.test-access.log combined
+  ErrorLog /var/log/apache2/aaa.test-error.log
+
+  <Location /balancer-manager>
+      SetHandler balancer-manager
+  #    Order deny,allow
+  #    Deny from all
+  #    Allow from 127.0.0.1 localhost.localdomain localhost ip6-localhost
+  </Location>
+  
+  ProxyRequests Off
+  ProxyPreserveHost On
+  ProxyPassReverse / balancer://cluster-www/
+  ProxyPassReverse / balancer://cluster-app/
+
+  ## Folder based matching
+  #ProxyPassMatch ^(/(images|image|imgs|img|javascripts|javascript|js|stylesheets|css)/.*)$ balancer://cluster-www$1 lbmethod=byrequests timeout=10
+  #Use Proxy to Amazon S3
+  ProxyPassMatch ^(/(images|image|imgs|img|javascripts|javascript|js|stylesheets|css)/.*)$ http://your-bucket.s3.amazonaws.com$1
+  #Use Amazon Cloudfront
+  #RedirectMatch ^(/(images|image|imgs|img|javascripts|javascript|js|stylesheets|css)/.*)$ http://your-bucket.s3.cloudfront.net$1
+
+  ## Extension based matching
+  #ProxyPassMatch ^(/.*\.(htm|html|ico|jpg|jpeg|png|gif|swf|txt))$ balancer://cluster-www$1 lbmethod=byrequests timeout=10
+  #Use Proxy to Amazon S3
+  ProxyPassMatch ^(/.*\.(htm|html|ico|jpg|jpeg|png|gif|swf|txt))$ http://your-bucket.s3.amazonaws.com$1
+  #Use Amazon Cloudfront
+  #RedirectMatch ^(/.*\.(htm|html|ico|jpg|jpeg|png|gif|swf|txt))$ http://your-bucket.cloudfront.net$1
+  ProxyPassMatch ^/balancer-manager.* !
+  ProxyPass / balancer://cluster-app/ lbmethod=byrequests timeout=10
+
+</VirtualHost>

data/wakame_generators/resource/templates/apache_www/apache_www.rb

@@ -1,26 +1,29 @@
 class Apache_WWW < Wakame::Service::Resource
-  include Wakame::Service::ApacheBasicProps
-  include WebCluster::HttpAssetServer
+  include HttpServer
+  include HttpAssetServer
 
-  def_attribute :listen_port, {:default=>8000}
-  def_attribute :max_instances, {:default=>5}
+  property :listen_port, {:default=>8000}
   
   def render_config(template)
-    template.cp(%w(conf/envvars-www init.d/apache2-www))
-    template.render(%w(conf/system-www.conf conf/sites-www.conf conf/apache2.conf))
+    template.glob_basedir(%w(conf/envvars-www init.d/apache2-www)) { |d|
+      template.cp(d)
+    }
+    template.glob_basedir(%w(conf/system-www.conf conf/apache2.conf conf/vh/*.conf)) { |d|
+      template.render(d)
+    }
     template.chmod("init.d/apache2-www", 0755)
   end
   
   def start(svc, action)
     cond = ConditionalWait.new { |cond|
       cond.wait_event(Wakame::Event::ServiceOnline) { |event|
-        event.instance_id == svc.instance_id
+        event.instance_id == svc.id
       }
     }
 
-    request = action.actor_request(svc.agent.agent_id,
-                                   '/service_monitor/register', svc.instance_id, :pidfile, '/var/run/apache2-www.pid').request
-    request = action.actor_request(svc.agent.agent_id,
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/service_monitor/register', svc.id, :pidfile, '/var/run/apache2-www.pid').request
+    request = action.actor_request(svc.cloud_host.agent_id,
                                    '/daemon/start', "apache_www", 'init.d/apache2-www'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process started")
@@ -31,26 +34,25 @@ class Apache_WWW < Wakame::Service::Resource
   def stop(svc, action)
     cond = ConditionalWait.new { |cond|
       cond.wait_event(Wakame::Event::ServiceOffline) { |event|
-        event.instance_id == svc.instance_id
+        event.instance_id == svc.id
       }
     }
 
-    request = action.actor_request(svc.agent.agent_id,
+    request = action.actor_request(svc.cloud_host.agent_id,
                                    '/daemon/stop', 'apache_www', 'init.d/apache2-www'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process stooped")
     }
     cond.wait
 
-    request = action.actor_request(svc.agent.agent_id,
-                                   '/service_monitor/unregister', svc.instance_id ).request
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/service_monitor/unregister', svc.id ).request
   end
   
   def reload(svc, action)
-    action.actor_request('/daemon/reload', 'apache_www', 'init.d/apache2-www') { |req|
-      req.wait
-      Wakame.log.debug("#{self.class} process reloaded")
-    }
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/daemon/reload', 'apache_www', 'init.d/apache2-www').request
+    request.wait
   end
   
 end

data/wakame_generators/resource/templates/apache_www/conf/apache2.conf

@@ -1,6 +1,6 @@
 #ServerRoot "/etc/apache2"
 #ServerRoot "/home/wakame/config/apache2"
-ServerRoot "<%= agent.root_path %>/tmp/config/apache_www/conf"
+ServerRoot "<%= cloud_host.agent.root_path %>/tmp/config/apache_www/conf"
 
 
 LockFile /var/lock/apache2/accept.lock
@@ -44,4 +44,16 @@ LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 </IfModule>
 
-Include ${SITES_INCLUDE_FILE}
+NameVirtualHost *:<%= resource.listen_port %>
+
+# Wild Card Virtual Host
+#<VirtualHost *:<%= resource.listen_port %>>
+#DocumentRoot /var/www
+#
+#LogLevel warn
+#CustomLog /var/log/apache2/access-www.log combined
+#ErrorLog /var/log/apache2/error-www.log
+#
+#</VirtualHost>
+
+Include vh/*.conf

data/wakame_generators/resource/templates/apache_www/conf/system-www.conf

@@ -36,7 +36,7 @@ LoadModule info_module /usr/lib/apache2/modules/mod_info.so
 
 
 ### Port configuration
-Listen <%= property.listen_port %>
+Listen <%= resource.listen_port %>
 
 #<IfModule mod_ssl.c>
 #    Listen 443

data/wakame_generators/resource/templates/apache_www/conf/vh/aaa.test.conf

@@ -0,0 +1,9 @@
+<VirtualHost *:<%= resource.listen_port %>>
+ServerName aaa.test
+DocumentRoot /home/wakame/apps/development/test/public
+
+LogLevel warn
+CustomLog /var/log/apache2/access-www.log combined
+ErrorLog /var/log/apache2/error-www.log
+
+</VirtualHost>

data/wakame_generators/resource/templates/ec2_elastic_ip/ec2_elastic_ip.rb

@@ -1,7 +1,7 @@
 class Ec2ElasticIp < Wakame::Service::Resource
   
-  def_attribute :elastic_ip, ''
-  def_attribute :require_agent, false
+  property :elastic_ip
+  property :require_agent, false
   
   def on_parent_changed(svc, action)
     start(svc, action)
@@ -11,12 +11,10 @@ class Ec2ElasticIp < Wakame::Service::Resource
     require 'right_aws'
     ec2 = RightAws::Ec2.new(Wakame.config.aws_access_key, Wakame.config.aws_secret_key)
 
-    puts svc.parent_instances.size.to_s
     a = svc.parent_instances.first
 
-    puts "#{a.class}, a.agent=#{a.agent}"
-    Wakame.log.info("Associating the Elastic IP #{self.elastic_ip} to #{a.agent.attr[:instance_id]}")
-    ec2.associate_address(a.agent.attr[:instance_id], self.elastic_ip)
+    Wakame.log.info("Associating the Elastic IP #{self.elastic_ip} to #{a.cloud_host.agent.vm_attr[:instance_id]}")
+    ec2.associate_address(a.cloud_host.agent.vm_attr[:instance_id], self.elastic_ip)
     EM.barrier {
       svc.update_status(Wakame::Service::STATUS_ONLINE)
     }
@@ -28,8 +26,8 @@ class Ec2ElasticIp < Wakame::Service::Resource
 
     a = svc.parent_instances.first
 
-    #Wakame.log.info("Disassociating the Elastic IP #{self.elastic_ip} from #{a.agent.attr[:instance_id]}")
-    #ec2.disassociate_address(self.elastic_ip)
+    Wakame.log.info("Disassociating the Elastic IP #{self.elastic_ip} from #{a.cloud_host.agent.vm_attr[:instance_id]}")
+    ec2.disassociate_address(self.elastic_ip)
     EM.barrier {
       svc.update_status(Wakame::Service::STATUS_OFFLINE)
     }

data/wakame_generators/resource/templates/ec2_elb/ec2_elb.rb

@@ -1,10 +1,11 @@
 class Ec2ELB < Wakame::Service::Resource
   
-  def_attribute :elb_name, 'unakatsuo'
-  def_attribute :require_agent, false
-  def_attribute :just_unregister_when_stop, false
+  property :elb_name
+  property :require_agent, false
+  property :just_unregister_when_stop, false
   
   def on_parent_changed(svc, action)
+    start(svc, action)
   end
 
   def start(svc, action)
@@ -12,8 +13,8 @@ class Ec2ELB < Wakame::Service::Resource
 
     parents = svc.parent_instances.dup
 
-    vm_slice_ids = parents.collect{|a| a.agent.attr[:instance_id] }
-    av_zones = parents.collect{|a| a.agent.attr[:availability_zone] }.uniq
+    vm_slice_ids = parents.collect{|a| a.cloud_host.agent.vm_attr[:instance_id] }.uniq
+    av_zones = parents.collect{|a| a.cloud_host.agent.vm_attr[:availability_zone] }.uniq
     Wakame.log.info("Setting up the ELB #{self.elb_name} with #{vm_slice_ids.join(', ')}")
     begin
       res = elb.describe_load_balancers(self.elb_name)
@@ -47,7 +48,7 @@ class Ec2ELB < Wakame::Service::Resource
 
     if self.just_unregister_when_stop
       parents = svc.parent_instances.dup
-      vm_slice_ids = parents.collect{|a| a.agent.attr[:instance_id] }
+      vm_slice_ids = parents.collect{|a| a.cloud_host.agent.vm_attr[:instance_id] }.uniq
       Wakame.log.info("Deregistering the VM instances (#{vm_slice_ids.join(', ')}) from ELB #{self.elb_name}")
 
       elb.deregister_instances_with_load_balancer(self.elb_name, *vm_slice_id)

data/wakame_generators/resource/templates/memcached/conf/memcached.conf

@@ -0,0 +1,47 @@
+# memcached default config file
+# 2003 - Jay Bonci <jaybonci@debian.org>
+# This configuration file is read by the start-memcached script provided as
+# part of the Debian GNU/Linux distribution. 
+
+# Run memcached as a daemon. This command is implied, and is not needed for the
+# daemon to run. See the README.Debian that comes with this package for more
+# information.
+-d
+
+# Log memcached's output to /var/log/memcached
+logfile /var/log/memcached.log
+
+# Be verbose
+# -v
+
+# Be even more verbose (print client commands as well)
+# -vv
+
+# Start with a cap of 64 megs of memory. It's reasonable, and the daemon default
+# Note that the daemon will grow to this size, but does not start out holding this much
+# memory
+-m <%= resource.memory_size %>
+
+# Default connection port is 11211
+-p <%= resource.listen_port %>
+
+# Run the daemon as root. The start-memcached will default to running as root if no
+# -u command is present in this config file
+-u <%= resource.user %>
+
+# Specify which IP address to listen on. The default is to listen on all IP addresses
+# This parameter is one of the only security measures that memcached has, so make sure
+# it's listening on a firewalled interface.
+-l <%= resource.bind_address %>
+
+# Limit the number of simultaneous incoming connections. The daemon default is 1024
+# -c 1024
+
+# Lock down all paged memory. Consult with the README and homepage before you do this
+# -k
+
+# Return error when memory is exhausted (rather than removing items)
+# -M
+
+# Maximize core file limit
+# -r

data/wakame_generators/resource/templates/memcached/init.d/memcached

@@ -0,0 +1,61 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:		memcached
+# Required-Start:	$syslog
+# Required-Stop:	$syslog
+# Should-Start:		$local_fs
+# Should-Stop:		$local_fs
+# Default-Start:	2 3 4 5
+# Default-Stop:		0 1 6
+# Short-Description:	memcached - Memory caching daemon
+# Description:		memcached - Memory caching daemon 
+### END INIT INFO
+
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/memcached
+DAEMONBOOTSTRAP=/usr/share/memcached/scripts/start-memcached
+NAME=memcached
+DESC=memcached
+PIDFILE=/var/run/$NAME.pid
+
+test -x $DAEMON || exit 0
+test -x $DAEMONBOOTSTRAP || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --exec $DAEMONBOOTSTRAP
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON 
+	echo "$NAME."
+	rm -f $PIDFILE
+	;;
+
+  restart|force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+	rm -f $PIDFILE
+	sleep 1
+	start-stop-daemon --start --quiet --exec $DAEMONBOOTSTRAP
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

data/wakame_generators/resource/templates/memcached/memcached.rb

@@ -0,0 +1,73 @@
+class Memcached < Wakame::Service::Resource
+
+  property :listen_port,  {:default => 11211 }
+  property :bind_address, {:default => '127.0.0.1'}
+  property :memory_size,  {:default => 64}
+  property :user,         {:default => 'nobody'}
+
+  def render_config(template)
+    template.cp('init.d/memcached')
+    template.render('conf/memcached.conf')
+    template.chmod("init.d/memcached", 0755)
+  end
+
+  def on_parent_changed(svc, action)
+    action.trigger_action(Wakame::Actions::DeployConfig.new(svc))
+    action.flush_subactions
+    reload(svc, action)
+  end
+
+  def start(svc, action)
+    cond = ConditionalWait.new { |cond|
+      cond.wait_event(Wakame::Event::ServiceOnline) { |event|
+        event.instance_id == svc.id
+      }
+    }
+
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/service_monitor/register',
+                                   svc.id, :pidfile, '/var/run/memcached.pid').request
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/start', "memcached", 'init.d/memcached'){ |req|
+      req.wait
+      Wakame.log.debug("#{self.class} process started")
+    }
+    
+    cond.wait
+  end
+  
+  def stop(svc, action)
+    cond = ConditionalWait.new { |cond|
+      cond.wait_event(Wakame::Event::ServiceOffline) { |event|
+        event.instance_id == svc.id
+      }
+    }
+
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/stop', 'memcached', 'init.d/memcached'){ |req|
+      req.wait
+      Wakame.log.debug("#{self.class} process stopped")
+    }
+
+    cond.wait
+
+    request = action.actor_request(svc.cloud_host.agent_id,
+                                   '/service_monitor/unregister', svc.instance_id).request
+  end
+
+  def reload(svc, action)
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/stop', 'memcached', 'init.d/memcached'){ |req|
+      req.wait
+      # Wakame.log.debug("#{self.class} process stopped")
+    }
+
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/start', "memcached", 'init.d/memcached'){ |req|
+      req.wait
+      # Wakame.log.debug("#{self.class} process started")
+      Wakame.log.debug("#{self.class} process reloaded")
+    }
+  end
+  
+end

data/wakame_generators/resource/templates/mysql_master/conf/my.cnf

@@ -17,9 +17,8 @@
 # escpecially if they contain "#" chars...
 # Remember to edit /etc/mysql/debian.cnf when changing the socket location.
 [client]
-port		= <%= property.mysqld_port %>
+port		= <%= resource.mysqld_port %>
 socket		= /var/run/mysqld/mysqld.sock
-default-character-set = utf8
 
 # Here is entries for some specific programs
 # The following values assume you have at least 32M ram
@@ -43,12 +42,11 @@ nice		= 0
 user		= mysql
 pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
-port		= <%= property.mysqld_port %>
+port		= <%= resource.mysqld_port %>
 basedir		= /usr
-datadir		= <%= property.mysqld_datadir %>
+datadir		= <%= resource.mysqld_datadir %>
 tmpdir		= /tmp
 language	= /usr/share/mysql/english
-default-character-set = utf8
 skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on
@@ -87,8 +85,8 @@ long_query_time = 2
 # The following can be used as easy to replay backup logs or for replication.
 # note: if you are setting up a replication slave, see README.Debian about
 #       other settings you may need to change.
-server-id		= 1
-log_bin			= <%= property.mysqld_log_bin %>
+server-id		= <%= resource.mysqld_server_id %>
+log_bin			= <%= resource.mysqld_log_bin %>
 #expire_logs_days	= 10
 #max_binlog_size         = 100M
 #binlog_do_db		= include_database_name