lib/deployment/install-centos-rubyweb.rb in capitate-0.2.1 vs lib/deployment/install-centos-rubyweb.rb in capitate-0.2.2

- old
+ new

@@ -24,11 +24,11 @@ # * Add admin group to suders ALL=(ALL) ALL script.run_all <<-CMDS egrep "^admin" /etc/group || /usr/sbin/groupadd admin sed -i -e 's/^id:5:initdefault:/id:3:initdefault:/g' /etc/inittab mkdir -p /var/www/apps - egrep "^%admin" /etc/sudoers || echo "%admin ALL=(ALL) ALL" > /etc/sudoers + egrep "^%admin" /etc/sudoers || echo "%admin ALL=(ALL) ALL" >> /etc/sudoers CMDS # Package installs yum.remove [ "openoffice.org-*", "ImageMagick" ] yum.update @@ -63,18 +63,10 @@ # Cleanup yum.clean end -# For mysql:install -set :mysql_pid_path, "/var/run/mysqld/mysqld.pid" -set :db_port, 3306 - -# For sphinx:install -set :sphinx_prefix, "/usr/local/sphinx" - - # # Install options # # Ruby install @@ -116,14 +108,19 @@ --pid-path=#{nginx_pid_path} --error-log-path=/var/log/nginx_master_error.log --lock-path=/var/lock/nginx \ --prefix=#{nginx_prefix_path} --with-md5=auto/lib/md5 --with-sha1=auto/lib/sha1 --with-http_ssl_module" } # Sphinx install +set :sphinx_prefix, "/usr/local/sphinx" set :sphinx_build_options, { :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz", :configure_options => "--with-mysql-includes=/usr/include/mysql --with-mysql-libs=/usr/lib/mysql \ --prefix=#{sphinx_prefix}" } + +# Mysql install +set :mysql_pid_path, "/var/run/mysqld/mysqld.pid" +set :db_port, 3306 # Imagemagick install set :imagemagick_build_options, { :url => "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick.tar.gz", :unpack_dir => "ImageMagick-*"