yyyc514-dwell 0.1.99

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2008 Robert Bousquet <robert[at]robertbousquet[dot]com>
+Copyright (c) 2008 Josh Goebel <dreamer3[at]gmail[dot]com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.txt

@@ -0,0 +1,37 @@
+DWELL  --  Capistrano recipe to setup a production Rails environment on Ubuntu.
+
+
+1) Install Capistrano2 if you don't already have it:
+$ sudo gem install capistrano
+
+2) Build this gem:
+$ gem build dwell.gemspec
+
+3) Install gem with:
+$ sudo gem install dwell-0.1.gem
+
+
+
+USAGE
+
+1) From within your Rails directory, run:
+$ capify .
+
+2) Click this link for recommended contents of config/deploy.rb:
+http://pastie.org/private/lodo1zveqgc2i0rto9idw
+
+3) Configure application name, domain, repository location and server name details
+
+4) $ cap dwell:install
+
+
+
+STACK DETAILS
+
+1) Updates Ubuntu sources and distro
+2) Installs Apache2
+3) Installs MySQL5
+4) Installs Subversion and Git
+5) Installs Ruby, RubyGems, Rails and Merb
+6) Installs Passenger module for Apache2 and creates basic config
+

data/bin/dwell

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts "coming soon"

data/lib/dwell/cap_extensions.rb

@@ -0,0 +1,118 @@
+require 'capistrano'
+require 'fileutils'
+
+module Dwell1
+
+  def record_install(package)
+    dwell1.append_to_file_if_missing "/etc/dwell/install_log", package
+  end
+
+  def config_gsub(file, find, replace)
+    tmp="/tmp/#{File.basename(file)}"
+    get file, tmp
+    content=File.open(tmp).read
+    content.gsub!(find,replace)
+    put content, tmp
+    sudo "mv #{tmp} #{file}"
+  end
+
+  def append_to_file_if_missing(filename, value, options={})
+    # XXX sort out single quotes in 'value' - they'l break command!
+    # XXX if options[:requires_sudo] and :use_sudo then use sudo
+    sudo <<-END
+    sh -c '
+    grep -F "#{value}" #{filename} > /dev/null 2>&1 || 
+    echo "#{value}" >> #{filename}
+    '
+    END
+  end
+  
+  def sudo_upload(from, to, options={}, &block)
+    top.upload from, "/tmp/#{File.basename(to)}", options, &block
+    sudo "mv /tmp/#{File.basename(to)} #{to}"
+    sudo "chmod #{options[:mode]} #{to}" if options[:mode]
+    sudo "chown #{options[:owner]} #{to}" if options[:owner]
+  end
+  
+  def adduser(user, options={})
+    options[:shell] ||= '/bin/bash' # new accounts on ubuntu 6.06.1 have been getting /bin/sh
+    switches = '--disabled-password --gecos ""'
+    switches += " --shell=#{options[:shell]} " if options[:shell]
+    switches += ' --no-create-home ' if options[:nohome]
+    switches += " --ingroup #{options[:group]} " unless options[:group].nil?
+    invoke_command "grep '^#{user}:' /etc/passwd || sudo /usr/sbin/adduser #{user} #{switches}", 
+    :via => run_method
+  end
+  
+  # create directory if it doesn't already exist
+  # set permissions and ownership
+  # XXX move mode, path and
+  def mkdir(path, options={})
+    via = options.delete(:via) || :run
+    # XXX need to make sudo commands wrap the whole command (sh -c ?)
+    # XXX removed the extra 'sudo' from after the '||' - need something else
+    invoke_command "test -d #{path} || #{sudo if via == :sudo} mkdir -p #{path}"
+    invoke_command "chmod #{sprintf("%3o",options[:mode]||0755)} #{path}", :via => via if options[:mode]
+    invoke_command "chown -R #{options[:owner]} #{path}", :via => via if options[:owner]
+#    groupadd(options[:group], :via => via) if options[:group]
+    invoke_command "chgrp -R #{options[:group]} #{path}", :via => via if options[:group]
+  end
+  
+  ##
+  # Run a command and ask for input when input_query is seen.
+  # Sends the response back to the server.
+  #
+  # +input_query+ is a regular expression that defaults to /^Password/.
+  #
+  # Can be used where +run+ would otherwise be used.
+  #
+  #  run_with_input 'ssh-keygen ...', /^Are you sure you want to overwrite\?/
+
+  def run_with_input(shell_command, input_query=/^Password/, response=nil)
+    handle_command_with_input(:run, shell_command, input_query, response)
+  end
+
+  ##
+  # Run a command using sudo and ask for input when a regular expression is seen.
+  # Sends the response back to the server.
+  #
+  # See also +run_with_input+
+  #
+  # +input_query+ is a regular expression
+
+  def sudo_with_input(shell_command, input_query=/^Password/, response=nil)
+    handle_command_with_input(:sudo, shell_command, input_query, response)
+  end
+
+  def invoke_with_input(shell_command, input_query=/^Password/, response=nil)
+    handle_command_with_input(run_method, shell_command, input_query, response)
+  end
+  
+  private
+  
+  ##
+  # Does the actual capturing of the input and streaming of the output.
+  #
+  # local_run_method: run or sudo
+  # shell_command: The command to run
+  # input_query: A regular expression matching a request for input: /^Please enter your password/
+
+  def handle_command_with_input(local_run_method, shell_command, input_query, response=nil)
+    send(local_run_method, shell_command, {:pty => true}) do |channel, stream, data|
+      logger.info data, channel[:host]
+      if data =~ input_query
+        if response
+          channel.send_data "#{response}\n"
+        else 
+          response = ::Capistrano::CLI.password_prompt "#{data}"
+          channel.send_data "#{response}\n"
+        end
+      end
+    end
+  end
+  
+  
+end
+
+Capistrano.plugin :dwell1, Dwell1
+

data/lib/dwell/known_hosts/github

@@ -0,0 +1 @@
+github.com,65.74.177.129 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==

data/lib/dwell/recipes/apache.rb

@@ -0,0 +1,107 @@
+require 'erb'
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :apache do
+
+      set :apache_server_name, nil
+      # set :apache_conf, nil
+      set :apache_default_vhost, false
+      set :apache_ctl, "/etc/init.d/apache2"
+      set :apache_server_aliases, []
+      # set :apache_proxy_port, 8000
+      # set :apache_proxy_servers, 2
+      # set :apache_proxy_address, "127.0.0.1"
+      set :apache_ssl_enabled, false
+      set :apache_ssl_ip, "*"
+      set :apache_ssl_forward_all, false
+
+      desc "Install Apache"  
+      task :install do
+        sudo "apt-get install apache2 apache2-threaded-dev -y"
+        dwell1.record_install "apache2"
+      end
+
+      # shorter form
+      task :setup do
+        site.setup
+      end
+    
+      namespace :site do
+    
+        desc "Configure site for apache"
+        task :setup do
+          set :apache_server_name, domain unless apache_server_name
+          server_aliases = []
+          server_aliases << "www.#{apache_server_name}" unless apache_server_name =~ /^www\./
+          server_aliases.concat apache_server_aliases
+          set :apache_server_aliases_array, server_aliases        
+        
+          # port 80
+          file = File.join(File.dirname(__FILE__), "../templates", "vhost.conf")
+          template = File.read(file)
+          buffer = ERB.new(template).result(binding)
+          # ssl
+          if apache_ssl_enabled
+            file = File.join(File.dirname(__FILE__), "../templates", "vhost_ssl.conf")
+            template = File.read(file)
+            buffer += ERB.new(template).result(binding)
+          end        
+        
+          put buffer, "/tmp/vhost"
+          sudo "mv /tmp/vhost /etc/apache2/sites-available/#{application}"
+          sudo "a2dissite default"
+          sudo "a2ensite #{application}"
+          # enable some modules we need
+          sudo "a2enmod rewrite"
+          sudo "a2enmod deflate"
+          sudo "a2enmod ssl" if apache_ssl_enabled
+        end
+      
+        desc "Disable this site"
+        task :disable do
+          sudo "a2dissite #{application}"
+        end
+        
+      end
+      
+      task :copy_certs do
+        Dir.glob("config/dwell/ssl/*").each do |file|
+          basename=File.basename(file)
+          dwell1.sudo_upload file, "/etc/ssl/certs/#{basename}" if file=~/.crt/
+          if file=~/.key/      
+            dwell1.sudo_upload file, "/etc/ssl/private/#{basename}", :mode => 0600, :owner => "root.admin"
+          end
+        end
+      end
+  
+      # Control
+      
+      desc "Start Apache"
+      task :start, :roles => :web do
+        sudo "#{apache_ctl} start"
+      end
+      
+      desc "Stop Apache"
+      task :stop, :roles => :web do
+        sudo "#{apache_ctl} stop"
+      end
+      
+      desc "Restart Apache"
+      task :restart, :roles => :web do
+        sudo "#{apache_ctl} restart"
+      end
+      
+      desc "Reload Apache"
+      task :reload, :roles => :web do
+        sudo "#{apache_ctl} reload"
+      end
+
+      desc "Force Reload Apache"
+      task :force_reload, :roles => :web do
+        sudo "#{apache_ctl} force-reload"
+      end
+  
+  
+    end
+  end
+end

data/lib/dwell/recipes/bootstrap/linode.rb

@@ -0,0 +1,75 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :linode do
+
+      task :create_deploy_user do
+        dwell1.adduser deploy_user, :group => "admin"
+        new_password = Capistrano::CLI.ui.ask("Enter password for #{deploy_user}:") { |q| q.echo = true }
+        dwell1.invoke_with_input("passwd #{deploy_user}", /UNIX password/, new_password)
+      end
+      
+      task :copy_ssh_key do
+        dwell1.mkdir "/home/#{deploy_user}/.ssh", :mode => 0700, :owner => "#{deploy_user}.admin"
+        put File.read("config/dwell/authorized_keys/#{deploy_user}"), "/home/#{deploy_user}/.ssh/authorized_keys", :mode => 0600
+        sudo "chown #{deploy_user}.admin /home/#{deploy_user}/.ssh/authorized_keys"
+      end
+      
+      task :disable_root_login do
+        dwell1.config_gsub "/etc/ssh/sshd_config", /^PermitRootLogin (.*)$/,"PermitRootLogin no" 
+        sudo "/etc/init.d/ssh reload"
+      end
+      
+      desc "setup static ip address" 
+      task :setup_static_ip do
+        ip,broadcast,mask,gateway=nil
+        run "/sbin/ifconfig eth0" do |channel, stream, data|
+          if data.match(/inet addr:([^ ]*)  Bcast:([^ ]*)  Mask:([^ ]*)/)
+            ip, broadcast, mask = $1, $2, $3
+          end
+        end
+        run "ip route" do |channel, stream, data|
+          gateway=$1 if data.match(/default via ([^ ]*) dev eth0/)
+        end
+
+          interface=<<-EOS
+iface eth0 inet static
+address #{ip}
+netmask #{mask.strip}
+broadcast #{broadcast}
+gateway #{gateway}
+          EOS
+          dwell1.config_gsub "/etc/network/interfaces", "iface eth0 inet dhcp", interface
+          sudo "chown root:root /etc/network/interfaces"
+          sudo "/etc/init.d/networking restart"
+          # kill the dhcp client
+          sudo "pkill dhclient3"
+      end
+      
+      desc "bootstrap linode box"
+      task :bootstrap do
+        set :deploy_user, user
+        auth_keys="config/dwell/authorized_keys/#{deploy_user}"
+        unless File.exist?(auth_keys)
+          puts "\n    Please place authorized SSH keys for #{deploy_user} in:"
+          puts "      #{auth_keys}\n\n"
+          exit
+        end
+        set :user, "root"
+        if ubuntu1.lsb_info[:distrib_codename]=="intrepid"
+          # for linode's slimmed down intrepid
+          run "addgroup admin"
+          dwell1.append_to_file_if_missing "/etc/sudoers", "%admin ALL=(ALL) ALL"
+          sudo "apt-get install ubuntu-standard -y" 
+        end
+        create_deploy_user
+        copy_ssh_key
+        set :user, deploy_user        
+        # test deploy login via ssh before we disable root login
+        sudo "echo"
+        disable_root_login
+        setup_static_ip
+      end
+
+    end
+  end
+end

data/lib/dwell/recipes/campfire.rb

@@ -0,0 +1,55 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+
+  namespace :dwell do
+    namespace :campfire do
+      set :campfire, nil
+      # set :campfire, {
+      #   :account => "campfireurl",
+      #   :login => "user@email.com",
+      #   :password => "blah",
+      #   :ssl => true,
+      #   :room => "Dwell Room"
+      # }
+
+      def campfire_bot
+        @bot ||= begin
+          svc=Tinder::Campfire.new(campfire[:account], {:ssl => campfire[:ssl]})
+          svc.login(campfire[:login],campfire[:password])
+          room=svc.find_room_by_name(campfire[:room])
+          room
+        end
+      end
+    
+      def speak(message)
+        return unless campfire
+        require 'tinder' unless defined?(Tinder)
+        campfire_bot.speak(message) 
+      end
+    
+      after "deploy:restart" do
+        speak "* #{application} has been restarted on #{domain.upcase}."
+      end
+
+      after "app:stop" do
+        speak "* #{application} has been stopped on #{domain.upcase}."
+      end
+
+      after "app:start" do
+        speak "* #{application} has been started on #{domain.upcase}."
+      end
+
+      after "deploy" do
+        speak "* Revision ##{real_revision} has been deployed to #{domain.upcase}."
+      end
+  
+      after "deploy:migrate" do
+        speak "* Migrations have been run on #{domain.upcase}."
+      end
+
+      after "deploy:cleanup" do
+        speak "* Cleaning old deploys from #{domain.upcase}."
+      end
+
+    end
+  end
+end

data/lib/dwell/recipes/extras/daemontools.rb

@@ -0,0 +1,57 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :daemontools do
+
+      task :add_intrepid_sources do
+        dwell1.append_to_file_if_missing "/etc/apt/sources.list", 
+          "deb-src http://archive.ubuntu.com/ubuntu intrepid main restricted universe multiverse"
+        sudo "apt-get update"  
+      end
+
+      task :build_from_source do
+        add_intrepid_sources
+        run "#{sudo} rm -rf tmp"
+        run "mkdir tmp"
+        run "cd tmp && #{sudo} apt-get -b source -t intrepid daemontools-run"
+        run "cd tmp && #{sudo} dpkg -i *.deb"
+        run "#{sudo} rm -rf tmp"
+      end
+
+      task :create_event_d do
+        cfg=<<-EOF
+        # svscan - daemontools
+        # https://bugs.launchpad.net/ubuntu/+source/daemontools-installer/+bug/66615
+        #
+        start on runlevel 2
+        start on runlevel 3
+        start on runlevel 4
+        start on runlevel 5
+
+        stop on runlevel 0
+        stop on runlevel 1
+        stop on runlevel 6
+
+        respawn
+        exec /usr/bin/svscanboot
+        EOF
+        put cfg, "/tmp/svscan"
+        sudo "mv /tmp/svscan /etc/event.d/svscan"
+      end
+      
+      desc "Install daemontools"  
+      task :install do
+        sudo "touch /etc/inittab" # install blows up if this file is not present
+        if ubuntu1.lsb_info[:distrib_codename]=="intrepid"
+          sudo "apt-get install daemontools daemontools-run -y"
+        else
+          puts "You are running #{ubuntu1.lsb_info[:DISTRIB_CODENAME]}. Building .debs from source."
+          build_from_source
+        end
+        create_event_d
+        sudo "initctl start svscan"
+        dwell1.record_install "daemontools"
+      end
+  
+    end
+  end
+end

data/lib/dwell/recipes/extras/php.rb

@@ -0,0 +1,3 @@
+## php via fcgi
+
+## see: http://wiki.brightbox.co.uk/docs:php

data/lib/dwell/recipes/extras/tinydns.rb

@@ -0,0 +1,61 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :tinydns do
+
+      task :add_intrepid_sources, :roles => :dns do
+        dwell1.append_to_file_if_missing "/etc/apt/sources.list", 
+          "deb-src http://archive.ubuntu.com/ubuntu intrepid main restricted universe multiverse"
+        sudo "apt-get update"  
+      end
+
+      task :build_from_source, :roles => :dns do
+        add_intrepid_sources
+        run "#{sudo} rm -rf tmp"
+        run "mkdir tmp"
+        run "cd tmp && #{sudo} apt-get -b source -t intrepid djbdns"
+        run "cd tmp && #{sudo} dpkg -i *.deb"
+        run "#{sudo} rm -rf tmp"
+      end
+      
+      desc "Install daemontools"  
+      task :install, :roles => :dns do
+        sudo "touch /etc/inittab" # install blows up if this file is not present
+        if ubuntu1.lsb_info[:distrib_codename]=="intrepid"
+          sudo "apt-get install djbdns -y"
+        else
+          puts "You are running #{ubuntu1.lsb_info[:distrib_codename]}. Building .debs from source."
+          sleep 2
+          build_from_source
+        end
+        dwell1.record_install "tinydns"
+      end
+      
+      set :dns_ip, nil
+      
+      task :setup, :roles => :dns do
+        if dns_ip.nil?
+          puts "Please set dns_ip in your deploy file to the IP of your DNS server."
+          exit
+        end
+        dwell1.adduser "tinydns", :nohome => true
+        sudo "tinydns-conf tinydns tinydns /etc/tinydns #{dns_ip}"
+        sudo "ln -s /etc/tinydns /etc/service"
+        sleep 2
+        run "svstat /etc/service/tinydns"
+      end
+      
+      # control
+      
+      desc "Start tinydns"
+      task :start, :roles => :dns do
+        sudo "svc -u /etc/service/tinydns"
+      end
+      
+      desc "Stop tinydns"
+      task :stop, :roles => :dns do
+        sudo "svc -d /etc/service/tinydns"
+      end
+  
+    end
+  end
+end

data/lib/dwell/recipes/gems.rb

@@ -0,0 +1,33 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :gems do
+  
+      set :rails_gem_version, nil
+  
+      desc "Install RubyGems"
+      task :install_rubygems do
+        run "mkdir -p src"
+        run "cd src && wget http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz"
+        run "cd src && tar xzf rubygems-1.3.1.tgz"
+        run "cd src/rubygems-1.3.1 && sudo ruby setup.rb"
+        run "sudo ln -sf /usr/bin/gem1.8 /usr/bin/gem"
+        run "cd ~/ && sudo rm -rf src"
+        dwell1.record_install "rubygems"
+      end
+  
+      desc "Install Gems"
+      task :install_gems do
+        sudo "gem install rails -v#{rails_gem_version} --no-rdoc --no-ri" if rails_gem_version
+        sudo "gem install rails capistrano rspec passenger mysql rdoc merb --no-rdoc --no-ri"
+        dwell1.record_install "default_gems"
+      end
+  
+      desc "Installation"
+      task :install do
+        install_rubygems
+        install_gems
+      end
+
+    end
+  end
+end

data/lib/dwell/recipes/git.rb

@@ -0,0 +1,25 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :git do
+
+      desc "Install Git"  
+      task :install do  
+        sudo "apt-get install git-core curl gitweb git-svn -y"
+        dwell1.record_install "git"
+      end
+
+      before "deploy" do
+        return unless scm==:git
+        st=`git status`
+        if st=~/branch is ahead/ and not ENV['FORCE']
+          puts
+          puts " * Your local branch appears to be ahead of the remote.  Do you need to push?"
+          puts " * You can force a deploy with FORCE=whatever if you wish."
+          puts
+          exit
+        end
+      end
+
+    end
+  end
+end

data/lib/dwell/recipes/imagemagick.rb

@@ -0,0 +1,26 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :imagemagick do
+  
+      desc "Install the ImageMagick binaries"
+      task :install_binary do
+        sudo "apt-get install imagemagick -y"
+        dwell1.record_install "imagemagick"
+      end
+      
+      desc "Install gems for ImageMagick"
+      task :install_gems do
+        sudo "apt-get install libmagick++9-dev -y" # needed to build the rmagick gem
+        sudo "gem install rmagick mini_magick --no-rdoc --no-ri"
+        dwell1.record_install "gem: rmagick, mini_magick"
+      end
+  
+      desc "Install ImageMagick and gems"
+      task :install do
+        install_binary
+        install_gems
+      end    
+
+    end
+  end
+end

data/lib/dwell/recipes/mercurial.rb

@@ -0,0 +1,13 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :mercurial do
+
+      desc "Install Mercurial (hg)"  
+      task :install do  
+        sudo "apt-get install mercurial -y"
+        dwell1.record_install "mercurial"
+      end
+
+    end
+  end
+end

data/lib/dwell/recipes/mysql/base.rb

@@ -0,0 +1,35 @@
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :dwell do
+    namespace :mysql do
+  
+      desc "Install MySQL5"
+      task :install, :roles => :db do
+        sudo "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get install -qyu --force-yes mysql-server mysql-client libmysqlclient15-dev"
+        dwell1.record_install "mysql5"
+      end
+      
+      # control
+      
+      desc "Start Mysql"
+      task :start, :roles => :db do
+        sudo "/etc/init.d/mysql start"
+      end
+      
+      desc "Stop Mysql"
+      task :stop, :roles => :db do
+        sudo "/etc/init.d/mysql stop"
+      end
+      
+      desc "Restart Mysql"
+      task :restart, :roles => :db do
+        sudo "/etc/init.d/mysql restart"
+      end
+      
+      desc "Reload Mysql"
+      task :reload, :roles => :db do
+        sudo "/etc/init.d/mysql reload"
+      end
+      
+    end
+  end
+end