wakame 0.4.1 → 0.4.2

data/app_generators/wakame/templates/cluster/resources/apache_lb/init.d/apache2-lb

@@ -1,192 +0,0 @@
-#!/bin/sh -e
-
-[ -n $WAKAME_ROOT ] || { echo "WAKAME_ROOT env was not set" >&2; exit 1; }
-
-ENV="env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin"
-
-SERVER_ROOT="$WAKAME_ROOT/tmp/config/apache_lb/conf"
-INITSCRIPT=`basename $0`
-DEF=`echo ${INITSCRIPT#apache2-} | tr '[:lower:]' '[:upper:]'`
-APACHE_ENVVARS="$SERVER_ROOT/envvars-`echo $DEF | tr '[:upper:]' '[:lower:]'`"
-APACHE_ARGS="-D$DEF -f $SERVER_ROOT/apache2.conf"
-
-[ $DEF = "APACHE2" ] && { echo "Apache server type is undefined" >&2; exit 1; }
-
-#[ `ls -1 /etc/apache2/sites-enabled/ | wc -l | sed -e 's/ *//;'` -eq 0 ] && \
-#echo "You haven't enabled any sites yet, so I'm not starting apache2." && \
-#echo "To add and enable a host, use addhost and enhost." && exit 0
-
-#edit /etc/default/apache2 to change this.
-HTCACHECLEAN_RUN=auto
-HTCACHECLEAN_MODE=daemon
-HTCACHECLEAN_SIZE=300M
-HTCACHECLEAN_DAEMON_INTERVAL=120
-HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
-HTCACHECLEAN_OPTIONS=""
-
-set -e
-if [ -x /usr/sbin/apache2 ] ; then
-        HAVE_APACHE2=1
-else
-        echo "No apache MPM package installed"
-        exit 0
-fi
-
-. /lib/lsb/init-functions
-
-test -f /etc/default/rcS && . /etc/default/rcS
-#test -f /etc/default/apache2 && . /etc/default/apache2
-
-APACHE2CTL="$ENV APACHE_ENVVARS=$APACHE_ENVVARS /usr/sbin/apache2ctl $APACHE_ARGS"
-CONFIG_TEST="$APACHE2CTL -t"
-HTCACHECLEAN="$ENV /usr/sbin/htcacheclean"
-
-check_htcacheclean() {
-        [ "$HTCACHECLEAN_MODE" = "daemon" ] || return 1
-
-        [ "$HTCACHECLEAN_RUN"  = "yes"    ] && return 0
-
-        [ "$HTCACHECLEAN_RUN"  = "auto" \
-          -a -e /etc/apache2/mods-enabled/disk_cache.load ] && return 0
-
-        return 1
-}
-
-start_htcacheclean() {
-        $HTCACHECLEAN $HTCACHECLEAN_OPTIONS -d$HTCACHECLEAN_DAEMON_INTERVAL \
-                        -i -p$HTCACHECLEAN_PATH -l$HTCACHECLEAN_SIZE
-
-}
-
-stop_htcacheclean() {
-        killall htcacheclean 2> /dev/null || echo ...not running
-}
-
-pidof_apache() {
-    # if pidof is null for some reasons the script exits automagically
-    # classified as good/unknown feature
-    PIDS=`pidof apache2` || true
-
-    PFILE=`. $APACHE_ENVVARS ; echo $APACHE_PID_FILE`
-    if [ -z "$PFILE" ] ; then
-        echo ERROR: APACHE_PID_FILE needs to be defined in $APACHE_ENVVARS >&2
-        exit 2
-    fi
-
-    [ -e $PFILE ] && PIDS2=`cat $PFILE`
-
-    # if there is a pid we need to verify that belongs to apache2
-    # for real
-    for i in $PIDS; do
-        if [ "$i" = "$PIDS2" ]; then
-            # in this case the pid stored in the
-            # pidfile matches one of the pidof apache
-            # so a simple kill will make it
-            echo $i
-            return 0
-        fi
-    done
-    return 1
-}
-
-apache_stop() {
-        if `$APACHE2CTL -t > /dev/null 2>&1`; then
-                # if the config is ok than we just stop normaly
-                $APACHE2CTL -k graceful-stop
-        else
-                # if we are here something is broken and we need to try
-                # to exit as nice and clean as possible
-                PID=$(pidof_apache)
-
-                if [ "${PID}" ]; then
-                        # in this case it is everything nice and dandy
-                        # and we kill apache2
-                        log_warning_msg "We failed to correctly shutdown apache, so we're now killing all running apache processes. This is almost certainly suboptimal, so please make sure your system is working as you'd expect now!"
-                        kill $PID
-                elif [ "$(pidof apache2)" ]; then
-                        if [ "$VERBOSE" != no ]; then
-                                echo " ... failed!"
-                                echo "You may still have some apache2 processes running.  There are"
-                                echo "processes named 'apache2' which do not match your pid file,"
-                                echo "and in the name of safety, we've left them alone.  Please review"
-                                echo "the situation by hand."
-                        fi
-                        return 1
-                fi
-        fi
-}
-
-# Stupid hack to keep lintian happy. (Warrk! Stupidhack!).
-case $1 in
-        start)
-                log_daemon_msg "Starting web server" "apache2"
-                if $APACHE2CTL -k start; then
-                        #if check_htcacheclean ; then
-                        #        log_progress_msg htcacheclean
-                        #        start_htcacheclean || log_end_msg 1
-                        #fi
-                        log_end_msg 0
-                else
-                        log_end_msg 1
-                fi
-        ;;
-        stop)
-                #if check_htcacheclean ; then
-                #        log_daemon_msg "Stopping web server" "htcacheclean"
-                #        stop_htcacheclean
-                #        log_progress_msg "apache2"
-                #else
-                        log_daemon_msg "Stopping web server" "apache2"
-                #fi
-                if apache_stop; then
-                        log_end_msg 0
-                else
-                        log_end_msg 1
-                fi
-        ;;
-        reload | force-reload)
-                if ! $APACHE2CTL -t > /dev/null 2>&1; then
-                    $APACHE2CTL -t || true
-                    log_end_msg 1
-                    exit 1
-                fi
-                log_daemon_msg "Reloading web server config" "apache2"
-                if pidof_apache > /dev/null ; then
-                    if $APACHE2CTL -k graceful $2 ; then
-                        log_end_msg 0
-                    else
-                        log_end_msg 1
-                    fi
-                fi
-        ;;
-        restart)
-                #if check_htcacheclean ; then
-                #        log_daemon_msg "Restarting web server" "htcacheclean"
-                #        stop_htcacheclean
-                #        log_progress_msg apache2
-                #else
-                        log_daemon_msg "Restarting web server" "apache2"
-                #fi
-                if ! apache_stop; then
-                        log_end_msg 1 || true
-                fi
-                sleep 5
-                if $APACHE2CTL -k start; then
-                        #if check_htcacheclean ; then
-                        #        start_htcacheclean || log_end_msg 1
-                        #fi
-                        log_end_msg 0
-                else
-                        log_end_msg 1
-                fi
-        ;;
-        configtest)
-               echo $APACHE2CTL -t -DDUMP_MODULES -DDUMP_VHOSTS
-               $APACHE2CTL -t -DDUMP_MODULES -DDUMP_VHOSTS
-               $APACHE2CTL -l
-        ;;
-        *)
-                log_success_msg "Usage: /etc/init.d/$INITSCRIPT {start|stop|restart|reload|force-reload|configtest}"
-                exit 1
-        ;;
-esac

data/app_generators/wakame/templates/cluster/resources/apache_www/apache_www.rb

@@ -1,50 +0,0 @@
-class Apache_WWW < Wakame::Service::Resource
-  include Wakame::Service::ApacheBasicProps
-  include WebCluster::HttpAssetServer
-
-  def_attribute :listen_port, {:default=>8000}
-  def_attribute :max_instances, {:default=>5}
-  
-  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.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
-      }
-    }
-
-    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,
-                                   '/daemon/start', "apache_www", 'init.d/apache2-www').request
-    #request.wait
-    cond.wait
-  end
-  
-  def stop(svc, action)
-    cond = ConditionalWait.new { |cond|
-      cond.wait_event(Wakame::Event::ServiceOffline) { |event|
-        event.instance_id == svc.instance_id
-      }
-    }
-
-    request = action.actor_request(svc.agent.agent_id,
-                                   '/daemon/stop', 'apache_www', 'init.d/apache2-www').request
-    #request.wait
-    cond.wait
-
-    request = action.actor_request(svc.agent.agent_id,
-                                   '/service_monitor/unregister', svc.instance_id ).request
-  end
-  
-  def reload(svc, action)
-    request = action.actor_request('/daemon/reload', 'apache_www', 'init.d/apache2-www').request
-    request.wait
-  end
-  
-end

data/app_generators/wakame/templates/cluster/resources/apache_www/conf/apache2.conf

@@ -1,47 +0,0 @@
-#ServerRoot "/etc/apache2"
-#ServerRoot "/home/wakame/config/apache2"
-ServerRoot "<%= agent.root_path %>/tmp/config/apache_www/conf"
-
-
-LockFile /var/lock/apache2/accept.lock
-PidFile ${APACHE_PID_FILE}
-
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-Include ${SYSTEM_INCLUDE_FILE}
-
-LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
-<IfModule mod_mime.c>
-TypesConfig /etc/mime.types
-
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-AddType application/x-bzip2 .bz2
-</IfModule>
-
-AccessFileName .htaccess
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-</Files>
-
-ErrorLog ${APACHE_ERROR_LOG_FILE}
-
-ServerTokens Full
-ServerSignature On
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive (see below).
-# If you are behind a reverse proxy, you might want to change %h into %{X-Forwarded-For}i
-#
-<IfModule mod_log_config.c>
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_proxy
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-</IfModule>
-
-Include ${SITES_INCLUDE_FILE}

data/app_generators/wakame/templates/cluster/resources/apache_www/conf/envvars-www

@@ -1,7 +0,0 @@
-export APACHE_RUN_USER=www-data
-export APACHE_RUN_GROUP=www-data
-export APACHE_PID_FILE=/var/run/apache2-www.pid
-export APACHE_ACCESS_LOG_FILE=/var/log/apache2/access-www.log
-export APACHE_ERROR_LOG_FILE=/var/log/apache2/error-www.log
-export SYSTEM_INCLUDE_FILE=system-www.conf
-export SITES_INCLUDE_FILE=sites-www.conf

data/app_generators/wakame/templates/cluster/resources/apache_www/conf/sites-www.conf

@@ -1,23 +0,0 @@
-NameVirtualHost *:<%= property.listen_port %>
-
-# Wild Card Virtual Host
-#<VirtualHost *:<%= property.listen_port %>>
-#DocumentRoot /var/www
-#
-#LogLevel warn
-#CustomLog /var/log/apache2/access-www.log combined
-#ErrorLog /var/log/apache2/error-www.log
-#
-#</VirtualHost>
-
-<%- cluster.virtual_hosts.each { |vh| -%>
-<VirtualHost *:<%= property.listen_port %>>
-ServerName <%= vh.server_name %>
-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/app_generators/wakame/templates/cluster/resources/apache_www/conf/system-www.conf

@@ -1,63 +0,0 @@
-Timeout 300
-KeepAlive Off
-#MaxKeepAliveRequests 100
-#KeepAliveTimeout 15
-
-<IfModule mpm_prefork_module>
-    StartServers          5
-    MinSpareServers       5
-    MaxSpareServers      10
-    MaxClients          150
-    MaxRequestsPerChild   0
-</IfModule>
-
-<IfModule mpm_worker_module>
-    StartServers          2
-    MaxClients          150
-    MinSpareThreads      25
-    MaxSpareThreads      75
-    ThreadsPerChild      25
-    MaxRequestsPerChild   0
-</IfModule>
-
-
-LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
-LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so
-LoadModule authn_file_module /usr/lib/apache2/modules/mod_authn_file.so
-LoadModule authz_default_module /usr/lib/apache2/modules/mod_authz_default.so
-LoadModule authz_groupfile_module /usr/lib/apache2/modules/mod_authz_groupfile.so
-LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
-LoadModule authz_user_module /usr/lib/apache2/modules/mod_authz_user.so
-LoadModule env_module /usr/lib/apache2/modules/mod_env.so
-LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so
-LoadModule status_module /usr/lib/apache2/modules/mod_status.so
-LoadModule info_module /usr/lib/apache2/modules/mod_info.so
-
-
-### Port configuration
-Listen <%= property.listen_port %>
-
-#<IfModule mod_ssl.c>
-#    Listen 443
-#</IfModule>
-
-
-<IfModule mod_status.c>
-<Location /server-status>
-    SetHandler server-status
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 localhost.localdomain localhost ip6-localhost
-</Location>
-</IfModule>
-
-<IfModule mod_info.c>
-<Location /server-info>
-    SetHandler server-info
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 localhost.localdomain localhost ip6-localhost
-</Location>
-</IfModule>
-

data/app_generators/wakame/templates/cluster/resources/apache_www/init.d/apache2-www

@@ -1,192 +0,0 @@
-#!/bin/sh -e
-
-[ -n $WAKAME_ROOT ] || { echo "WAKAME_ROOT env was not set" >&2; exit 1; }
-
-ENV="env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin"
-
-SERVER_ROOT="$WAKAME_ROOT/tmp/config/apache_www/conf"
-INITSCRIPT=`basename $0`
-DEF=`echo ${INITSCRIPT#apache2-} | tr '[:lower:]' '[:upper:]'`
-APACHE_ENVVARS="$SERVER_ROOT/envvars-`echo $DEF | tr '[:upper:]' '[:lower:]'`"
-APACHE_ARGS="-D$DEF -f $SERVER_ROOT/apache2.conf"
-
-[ $DEF = "APACHE2" ] && { echo "Apache server type is undefined" >&2; exit 1; }
-
-#[ `ls -1 /etc/apache2/sites-enabled/ | wc -l | sed -e 's/ *//;'` -eq 0 ] && \
-#echo "You haven't enabled any sites yet, so I'm not starting apache2." && \
-#echo "To add and enable a host, use addhost and enhost." && exit 0
-
-#edit /etc/default/apache2 to change this.
-HTCACHECLEAN_RUN=auto
-HTCACHECLEAN_MODE=daemon
-HTCACHECLEAN_SIZE=300M
-HTCACHECLEAN_DAEMON_INTERVAL=120
-HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
-HTCACHECLEAN_OPTIONS=""
-
-set -e
-if [ -x /usr/sbin/apache2 ] ; then
-        HAVE_APACHE2=1
-else
-        echo "No apache MPM package installed"
-        exit 0
-fi
-
-. /lib/lsb/init-functions
-
-test -f /etc/default/rcS && . /etc/default/rcS
-#test -f /etc/default/apache2 && . /etc/default/apache2
-
-APACHE2CTL="$ENV APACHE_ENVVARS=$APACHE_ENVVARS /usr/sbin/apache2ctl $APACHE_ARGS"
-CONFIG_TEST="$APACHE2CTL -t"
-HTCACHECLEAN="$ENV /usr/sbin/htcacheclean"
-
-check_htcacheclean() {
-        [ "$HTCACHECLEAN_MODE" = "daemon" ] || return 1
-
-        [ "$HTCACHECLEAN_RUN"  = "yes"    ] && return 0
-
-        [ "$HTCACHECLEAN_RUN"  = "auto" \
-          -a -e /etc/apache2/mods-enabled/disk_cache.load ] && return 0
-
-        return 1
-}
-
-start_htcacheclean() {
-        $HTCACHECLEAN $HTCACHECLEAN_OPTIONS -d$HTCACHECLEAN_DAEMON_INTERVAL \
-                        -i -p$HTCACHECLEAN_PATH -l$HTCACHECLEAN_SIZE
-
-}
-
-stop_htcacheclean() {
-        killall htcacheclean 2> /dev/null || echo ...not running
-}
-
-pidof_apache() {
-    # if pidof is null for some reasons the script exits automagically
-    # classified as good/unknown feature
-    PIDS=`pidof apache2` || true
-
-    PFILE=`. $APACHE_ENVVARS ; echo $APACHE_PID_FILE`
-    if [ -z "$PFILE" ] ; then
-        echo ERROR: APACHE_PID_FILE needs to be defined in $APACHE_ENVVARS >&2
-        exit 2
-    fi
-
-    [ -e $PFILE ] && PIDS2=`cat $PFILE`
-
-    # if there is a pid we need to verify that belongs to apache2
-    # for real
-    for i in $PIDS; do
-        if [ "$i" = "$PIDS2" ]; then
-            # in this case the pid stored in the
-            # pidfile matches one of the pidof apache
-            # so a simple kill will make it
-            echo $i
-            return 0
-        fi
-    done
-    return 1
-}
-
-apache_stop() {
-        if `$APACHE2CTL -t > /dev/null 2>&1`; then
-                # if the config is ok than we just stop normaly
-                $APACHE2CTL -k graceful-stop
-        else
-                # if we are here something is broken and we need to try
-                # to exit as nice and clean as possible
-                PID=$(pidof_apache)
-
-                if [ "${PID}" ]; then
-                        # in this case it is everything nice and dandy
-                        # and we kill apache2
-                        log_warning_msg "We failed to correctly shutdown apache, so we're now killing all running apache processes. This is almost certainly suboptimal, so please make sure your system is working as you'd expect now!"
-                        kill $PID
-                elif [ "$(pidof apache2)" ]; then
-                        if [ "$VERBOSE" != no ]; then
-                                echo " ... failed!"
-                                echo "You may still have some apache2 processes running.  There are"
-                                echo "processes named 'apache2' which do not match your pid file,"
-                                echo "and in the name of safety, we've left them alone.  Please review"
-                                echo "the situation by hand."
-                        fi
-                        return 1
-                fi
-        fi
-}
-
-# Stupid hack to keep lintian happy. (Warrk! Stupidhack!).
-case $1 in
-        start)
-                log_daemon_msg "Starting web server" "apache2"
-                if $APACHE2CTL -k start; then
-                        #if check_htcacheclean ; then
-                        #        log_progress_msg htcacheclean
-                        #        start_htcacheclean || log_end_msg 1
-                        #fi
-                        log_end_msg 0
-                else
-                        log_end_msg 1
-                fi
-        ;;
-        stop)
-                #if check_htcacheclean ; then
-                #        log_daemon_msg "Stopping web server" "htcacheclean"
-                #        stop_htcacheclean
-                #        log_progress_msg "apache2"
-                #else
-                        log_daemon_msg "Stopping web server" "apache2"
-                #fi
-                if apache_stop; then
-                        log_end_msg 0
-                else
-                        log_end_msg 1
-                fi
-        ;;
-        reload | force-reload)
-                if ! $APACHE2CTL -t > /dev/null 2>&1; then
-                    $APACHE2CTL -t || true
-                    log_end_msg 1
-                    exit 1
-                fi
-                log_daemon_msg "Reloading web server config" "apache2"
-                if pidof_apache > /dev/null ; then
-                    if $APACHE2CTL -k graceful $2 ; then
-                        log_end_msg 0
-                    else
-                        log_end_msg 1
-                    fi
-                fi
-        ;;
-        restart)
-                #if check_htcacheclean ; then
-                #        log_daemon_msg "Restarting web server" "htcacheclean"
-                #        stop_htcacheclean
-                #        log_progress_msg apache2
-                #else
-                        log_daemon_msg "Restarting web server" "apache2"
-                #fi
-                if ! apache_stop; then
-                        log_end_msg 1 || true
-                fi
-                sleep 5
-                if $APACHE2CTL -k start; then
-                        #if check_htcacheclean ; then
-                        #        start_htcacheclean || log_end_msg 1
-                        #fi
-                        log_end_msg 0
-                else
-                        log_end_msg 1
-                fi
-        ;;
-        configtest)
-               echo $APACHE2CTL -t -DDUMP_MODULES -DDUMP_VHOSTS
-               $APACHE2CTL -t -DDUMP_MODULES -DDUMP_VHOSTS
-               $APACHE2CTL -l
-        ;;
-        *)
-                log_success_msg "Usage: /etc/init.d/$INITSCRIPT {start|stop|restart|reload|force-reload|configtest}"
-                exit 1
-        ;;
-esac

data/app_generators/wakame/templates/cluster/resources/ec2_elastic_ip/ec2_elastic_ip.rb

@@ -1,39 +0,0 @@
-class Ec2ElasticIp < Wakame::Service::Resource
-  
-  def_attribute :elastic_ip, ''
-  def_attribute :require_agent, false
-  
-  def on_parent_changed(svc, action)
-    start(svc, action)
-  end
-
-  def start(svc, action)
-    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)
-    EM.barrier {
-      svc.update_status(Wakame::Service::STATUS_ONLINE)
-    }
-  end
-  
-  def stop(svc, action)
-    require 'right_aws'
-    ec2 = RightAws::Ec2.new(Wakame.config.aws_access_key, Wakame.config.aws_secret_key)
-
-    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)
-    EM.barrier {
-      svc.update_status(Wakame::Service::STATUS_OFFLINE)
-    }
-
-  end
-
-end