rhoconnect 3.1.2 → 3.2.0.beta1

data/installer/unix-like/create_texts.rb

@@ -32,6 +32,10 @@ optparse = OptionParser.new do |opts|
     options[:web_server] = server
   end #do
 
+  opts.on('-l', '--Logfile file', ' Specify installtion log file') do |file|
+    options[:log_file] = file
+  end #do
+
 end #do
 
 optparse.parse!
@@ -42,6 +46,9 @@ optparse.parse!
 @ruby_version = options[:rubyVersion]
 @profile = (@dist == 'debian') ? '~/.profile' : '~/.bash_profile'
 @server = options[:web_server]
+@log_file = options[:log_file]
+
+@passenger_root = Constants::PASSENGER_ROOT
 
 def passenger_version
   (`#{@prefix}/bin/passenger --version`.match /\d+\.\d+\.\d+/)[0]
@@ -229,7 +236,6 @@ end
 
 #
 # Nginx stuff ...
-
 def create_nginx_init
   nginx_init_script = <<'_NGINX_INIT_SCRIPT_'
 #!/bin/sh
@@ -300,11 +306,11 @@ _NGINX_INIT_SCRIPT_
   `chmod +x #{nginx_script}`
 
   # Set run levels
-#  if @dist == 'debian'
-#    #`update-rc.d -f nginx defaults`
-#  else
-#    #`/sbin/chkconfig nginx on`
-#  end
+  #  if @dist == 'debian'
+  #    #`update-rc.d -f nginx defaults`
+  #  else
+  #    #`/sbin/chkconfig nginx on`
+  #  end
 
 end
 
@@ -329,7 +335,6 @@ end
 def create_nginx_conf_files(app_name)
   nginx_server_conf = <<'_NGINX_CONF_'
 user              nginx;
-
 worker_processes  4;
 
 error_log         logs/error.log;
@@ -367,28 +372,40 @@ _NGINX_CONF_
 
   Dir.mkdir "/opt/nginx/conf/conf.d" unless File.exist? "/opt/nginx/conf/conf.d"
   rho_vhost_conf = <<_VHOST_CONF_
+upstream thin_cluster {
+  server unix:/tmp/thin.sock;
+  #server unix:/tmp/thin.0.sock;
+  #server unix:/tmp/thin.1.sock;
+  #server unix:/tmp/thin.2.sock;
+  #server unix:/tmp/thin.3.sock;
+}
+
 server {
   listen      80;
   root  /opt/nginx/html/#{app_name}/public; # <-- be sure to point to 'public' folder of your application!
-  passenger_enabled on;
-#  access_log off;                           # <-- disable access logging
-#  error_log /dev/null crit;                 # <-- disable error logging, but critical errors only
-}
+  #  access_log off;                           # <-- disable access logging
+  #  error_log /dev/null crit;                 # <-- disable error logging, but critical errors only
+    
+  location / {
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+
+    proxy_pass http://thin_cluster;
+  }
+
+  error_page 500 502 503 504 /50x.html;
+  location = /50x.html {
+    root html;
+  }
+}     
 _VHOST_CONF_
-  File.open('/opt/nginx/conf/conf.d/rhoconnect.conf', 'w' ) { |f| f << rho_vhost_conf }
 
-  passenger_conf = <<_PASSENGER_CONF_
-passenger_root /opt/rhoconnect/lib/ruby/gems/1.8/gems/passenger-#{passenger_version};
-passenger_ruby /opt/rhoconnect/bin/ruby;
-passenger_max_pool_size 20;
-passenger_min_instances 6;
-_PASSENGER_CONF_
-  File.open('/opt/nginx/conf/conf.d/passenger.conf', 'w' ) { |f| f << passenger_conf }
+  File.open('/opt/nginx/conf/conf.d/rhoconnect.conf', 'w' ) { |f| f << rho_vhost_conf }
 end
-
 # End of nginx stuff ...
 
-
 # generate_common_info
 # Generates the readme info that is common across all distributions
 def generate_common_info
@@ -456,87 +473,6 @@ _README2_
   readme
 end #generate_common_info
 
-def create_passenger_load
-  if @dist == 'debian'
-    passenger_load_file = '/etc/apache2/mods-available/passenger.load'
-  else
-    passenger_load_file = '/etc/httpd/conf.d/passenger.conf'
-  end # if
-
-  passenger_load = <<_PASSENGER_LOAD_
-LoadModule passenger_module /opt/rhoconnect/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}/ext/apache2/mod_passenger.so
-PassengerRoot /opt/rhoconnect/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}
-PassengerRuby /opt/rhoconnect/bin/ruby
-_PASSENGER_LOAD_
-
-  File.open( passenger_load_file, 'w' ) { |f| f << passenger_load }
-end #create_passenger_load
-
-def create_apache_vhost
-  if @dist == 'debian' 
-    vhost_file = '/etc/apache2/sites-available/rhoconnect'
-  else
-    vhost_file = '/etc/httpd/conf.d/rhoconnect.conf' 
-  end
-  vhost = <<_VHOST_
-<VirtualHost *:80>
-  ServerName www.yourhost.com
-  DocumentRoot /var/www/rhoapp/public
-  PassengerMaxPoolSize 20
-  PassengerMinInstances 6
-  #...
-  <Directory /var/www/rhoconnect/public>
-    AllowOverride all
-    Options -MultiViews
-  </Directory>
-</VirtualHost>
-_VHOST_
-
-  File.open( vhost_file, 'w' ) { |f| f << vhost }
-end #create_apache_vhost
-
-# The debian Apache2 specific part of the readme and places it in options[:prefix]
-def debian_apache_readme
-  readme = <<_README_
-4) Installer created the following Apache2 configuration files:
-   - rhoconnect application template (/etc/apache2/sites-available/rhoconnect)
-   - passenger module (/etc/apache2/mods-available/passenger.load)
-     
-   To complete setup of web server
-   A) Configure virtual host for rhoconnect application:
-      Edit the file /etc/apache2/sites-available/rhoconnect so that it reflects your specifications.
-
-   B) Enable the virtual host:
-      sudo a2ensite rhoconnect
-
-   C) Load the passenger.load module
-      sudo a2enmod passenger
-
-   D) Start server to pick up the changes:
-      sudo /etc/init.d/apache2 start
-_README_
-
-  readme
-end
-  
-# The non-debian Apache2 specific part of the readme file and places it in options[:prefix]
-def yum_apache_readme
-  readme = <<_README_
-4) Installer created the following Apache2 configuration files:
-   - rhoconnect application template (/etc/httpd/conf.d/rhoconnect.conf)
-   - passenger module (/etc/httpd/conf.d/passenger.conf)
-
-   To complete setup of web server
-   A) Configure virtual host for rhoconnect application:
-      Edit the file /etc/httpd/conf.d/rhoconnect.conf so that it reflects your specifications.
-
-   B) As root user start server to pick up the changes:
-      /sbin/service httpd start
-_README_
-
-  readme
-end
-
 def nginx_readme
   readme = <<_NGINX_README_
 4) Installer compiled Nginx web server (/opt/nginx) with the following configuration files:
@@ -587,6 +523,30 @@ def copy_benchapp(rho_path)
   `chown -R nginx:nginx benchapp/`
 end
 
+def config_and_install_thin_scripts(rho_path)
+  puts "Configuring and installing thin scripts ..."
+  `#{rho_path}/bin/thin install`
+
+  # >> Installing thin service at /etc/rc.d/thin ...
+  # mkdir -p /etc/rc.d
+  # writing /etc/rc.d/thin
+  # chmod +x /etc/rc.d/thin
+  # mkdir -p /etc/thin
+  #
+  # To configure thin to start at system boot:
+  # on RedHat like systems:
+  #   sudo /sbin/chkconfig --level 345 thin on
+  # on Debian-like systems (Ubuntu):
+  #   sudo /usr/sbin/update-rc.d -f thin defaults
+  # on Gentoo:
+  #   sudo rc-update add thin default
+  #
+  # Then put your config files in /etc/thin
+
+  `#{rho_path}/bin/thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ --socket /tmp/thin.sock --log /opt/nginx/logs/thin.log --pid /var/run/thin.pid -e production`
+  `ln -s /etc/rc.d/thin /etc/init.d/.` if File.directory?('/etc/rc.d')
+end
+
 def create_texts
   if @redis
     create_redis_init 
@@ -595,8 +555,8 @@ def create_texts
 
   if @server == 'nginx'
     create_nginx_init
-
     create_nginx_logrotate
+
     @use_bench_app = File.exist? "#{@prefix}/installer/bench.tar.gz"
     if @use_bench_app
       create_nginx_conf_files "benchapp"
@@ -605,12 +565,8 @@ def create_texts
       create_nginx_conf_files "rhoapp"
       generate_rhoapp @prefix
     end
-
+    config_and_install_thin_scripts(@prefix)
     distro_info = nginx_readme
-  else
-    create_passenger_load
-    create_apache_vhost
-    distro_info = (@dist == 'debian') ? debian_apache_readme : yum_apache_readme
   end
 
   common_info = generate_common_info
@@ -641,30 +597,22 @@ _IT_SHOULD_BE_DONE_
 
 _NGINX_TO_DO_
     else
-      if  @server == 'nginx'
-        server_todo_list = <<_NGINX_TO_DO_
+      server_todo_list = <<_NGINX_TO_DO_
 2) Try rhoconnect 'rhoapp' application, created in /opt/nginx/html directory
   A) As root user start redis and nginx servers:
      /etc/init.d/redis start
      /etc/init.d/nginx start
+     /etc/init.d/thin start
   B) Open RhoConnect application web console in your browser:
      http://localhost/console/
 
 _NGINX_TO_DO_
-      else
-        server_todo_list = <<_APACHE2_TO_DO_
-2) Complete setup of Apache2 web server
-   A) Configure virtual host for your rhoconnect application:
-      Edit the file /etc/httpd/conf.d/rhoconnect.conf so that it reflects your specifications.
-   B) As root user start server to pick up the changes:
-      /sbin/service httpd start
-       
-_APACHE2_TO_DO_
-      end
     end
 
-  puts afterwords + about_app   + "For more details see #{@prefix}/README file."
-
-end #create_texts
+  afterwords << about_app
+  afterwords << "For more details see #{@prefix}/README file."
+  puts afterwords
+  File.open("#{@log_file}", 'a') { |f| f << afterwords } if @log_file
+end
 
 create_texts

data/installer/unix-like/post_install.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
 
+#echo "after_install script is running ..."
+echo "Starting rhoconnect installer ..."
+
 cd /opt/rhoconnect/installer
 ./install.sh

data/installer/unix-like/post_uninstall.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#echo "after_remove script is running ..."
+
 if [ -d "/opt/rhoconnect" ]; then
   rm -rf /opt/rhoconnect
 fi

data/installer/unix-like/pre_install.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
-if [ -d "/opt/rhoconnect" ]; then
-  rm -rf /opt/rhoconnect
-fi
+#echo "before_install script is running ..."
+
+#if [ -d "/opt/rhoconnect" ]; then
+#  rm -rf /opt/rhoconnect
+#fi
 
 #if [ -d "/opt/nginx" ]; then
 #  rm -rf /opt/nginx

data/installer/unix-like/pre_uninstall.sh

@@ -1,23 +1,31 @@
 #!/bin/bash
 
+#echo "before_remove script is running ..."
+echo "Stopping rhoconnect services and remove init scripts ..."
+
 # Stop redis
 if [ -e "/etc/init.d/redis" ]; then
   /etc/init.d/redis stop
-  if [[ `which dpkg 2> /dev/null` != "" ]]; then # Debian
+  if [[ `which dpkg 2> /dev/null` != "" ]]; then  # Debian
     update-rc.d -f redis remove
-  elif [[ `which rpm 2> /dev/null` != "" ]]; then   # Red Hat
+  elif [[ `which rpm 2> /dev/null` != "" ]]; then # Red Hat
     /sbin/chkconfig redis off
   fi
 fi
 
+#stop thin
+if [ -e "/etc/init.d/thin" ]; then /etc/init.d/thin stop; fi
+
 #stop nginx
-if [ -e "/etc/init.d/nginx" ]; then
-  /etc/init.d/nginx stop
-fi
+if [ -e "/etc/init.d/nginx" ]; then /etc/init.d/nginx stop; fi
 
-# /etc/logrotate.d/redis
+#/etc/logrotate.d/redis
 rm -f /etc/init.d/redis
 rm -f /etc/logrotate.d/redis
 
 rm -f /etc/init.d/nginx
 rm -f /etc/logrotate.d/nginx
+
+rm -f /etc/thin/rhoapp.yml
+rm -f /etc/rc.d/thin
+rm -f /etc/init.d/thin

data/installer/unix-like/rho_connect_install_checkers.rb

@@ -110,7 +110,7 @@ module Checkers
       end #if
       log_print string
     rescue
-      @log.error {"#{@options[:web_server]} web server not unresponsive!"}
+      @log.error {"#{@options[:web_server]} web server unresponsive!"}
     end
 
     running

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,23 +8,19 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
+  RUBY                    = "ruby-1.9.3-p125"
   REDIS                   = "redis-2.4.10"
   SQLITE3                 = "sqlite-autoconf-3071000"
+  NGINX                   = "nginx-1.0.15"
+  PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
-  RUBY                    = "ruby-enterprise-1.8.7-2012.02"
-  Nginx                   = "nginx-1.0.14"
-
-  SOFTWARE                = [ REDIS, SQLITE3, RUBY, Nginx ]
+  SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]
 
   REDIS_URL               = "http://redis.googlecode.com/files/#{ REDIS }.tar.gz"
   SQLITE3_URL             = "http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz"
-
   URLS                    = [ REDIS_URL, SQLITE3_URL ]
-
-  RUBYGEMS_VERSION        = "1.8.15"
-  GEMS                    = ["bundler", "passenger",
-                             "thor", "ffaker"] # thor and ffaker required by rhoconnect-benchmark utility
-
+  GEMS                    = ["bundler", "thin", "foreman"]
+    
   SUPPORTED_PKG_MGRS      = ["apt-get", "yum"]
   SUPPORTED_WEB_SERVERS   = ["apache2", "nginx"]
 

data/installer/unix-like/rho_connect_install_debian.rb

@@ -40,8 +40,8 @@ class Debian
 
     #start installing
     install_all_gems
-    configure_passenger @options
-
+    configure_nginx @options
+    
     #install rhoconnect
     install_rhoconnect
     

data/installer/unix-like/rho_connect_install_dnd.rb

@@ -15,9 +15,6 @@ module DownloadAndDocompress
         downloads += 1
       end #if
     end #do
-#    if downloads == 0
-#      log_print "Nothing additional to download"
-#    end #if
   end #download_and_decompress
 
   # wget_download
@@ -26,7 +23,7 @@ module DownloadAndDocompress
   def wget_download(prefix, url)
     if !File.exists?("#{ prefix }/#{ get_tarball_name url }") &&
        !File.directory?("#{ prefix }/#{ get_version url }")
-        cmd "wget -P #{ prefix } #{ url } "
+       cmd "wget -P #{prefix} #{url} -o /dev/null"
     end #if
   end #wget_download
 
@@ -36,7 +33,7 @@ module DownloadAndDocompress
   def decompress(prefix, url)
     tarball = get_tarball_name(url)
     dir = get_version(url)
-    cmd "tar -xzf #{ prefix }/#{ tarball } -C #{ prefix }" unless File.directory? "#{ prefix }/#{ dir }"
+    cmd "tar -xzf #{prefix}/#{tarball} -C #{prefix} > /dev/null 2>&1" unless File.directory? "#{prefix}/#{dir}"
   end #decompress
   
   # get_version

data/installer/unix-like/rho_connect_install_installers.rb

@@ -4,32 +4,24 @@ require 'rho_connect_install_checkers'
 include Checkers
 
 module Installers
-  # configure_passenger
-  # This method installs items that were retrieved via wget as well as passenger
-  def configure_passenger(options)
+  def configure_nginx(options)
     raise "Please stop the web server and then reinstall the package." if check_web_server_running
-
     @options=options
-    print_header "Configuring passenger ..."
-    if @options[:web_server]
-      if @options[:web_server] == "apache2"
-        print_header "Configuring apache2 to work with passenger ..."
-        cmd "yes | #{@options[:prefix]}/bin/passenger-install-#{ @options[:web_server] }-module"
-      elsif @options[:web_server] == "nginx"
-        nginx_version = Constants::Nginx
-        print_header "Downloading http://nginx.org/download/#{nginx_version}.tar.gz ..."
-        cmd "cd #{@options[:prefix]}; wget http://nginx.org/download/#{nginx_version}.tar.gz -o /dev/null; tar -xzvf #{nginx_version}.tar.gz"        
-        print_header "Configuring and compiling Nginx to work with passenger ..."
-        cmd "#{@options[:prefix]}/bin/passenger-install-nginx-module --auto --prefix=/opt/nginx \
-        --nginx-source-dir=#{@options[:prefix]}/#{nginx_version} \
-        --extra-configure-flags='--with-http_ssl_module --with-http_gzip_static_module --user=nginx --group=nginx'"
-      else
-        raise "Unsupported web server."   
-      end
+    if @options[:web_server] && @options[:web_server] == "nginx"
+      nginx_version = Constants::NGINX
+      print_header "Downloading http://nginx.org/download/#{nginx_version}.tar.gz ..."
+      cmd "cd #{@options[:prefix]}; wget http://nginx.org/download/#{nginx_version}.tar.gz -o /dev/null; tar -xzvf #{nginx_version}.tar.gz"        
+      print_header "Configuring and compiling Nginx web server ..."
+
+      Dir.chdir("#{@options[:prefix]}/#{nginx_version}")
+      cmd "./configure --prefix=/opt/nginx --with-http_ssl_module --with-http_gzip_static_module --user=nginx --group=nginx"
+      cmd "make 2>&1; make install"
+    else
+      raise "Inernal error: only nginx is supported."
     end
     raise "Nginx installation failed." if $? != 0
   end
-    
+      
   # install_all_gems
   # This method installs all gems specified in the GEMS list defined in the
   # Constants file
@@ -90,7 +82,7 @@ module Installers
   # install_sqlite
   # This method instaqll sqlite
   def install_sqlite
-    print_header "Installing sqlite3 libs ..."
+    print_header "Installing sqlite3 ..."
     Dir.chdir("#{@options[:prefix]}/#{Constants::SQLITE3}")
     cmd "./configure --prefix=#{@options[:prefix]}"
     cmd "make 2>&1; make install"
@@ -100,7 +92,7 @@ module Installers
   # install_rhoconnect
   # This method installs rhoconnect
   def install_rhoconnect
-    print_header "Installing rhoconnect ..."
+    print_header "\nInstalling rhoconnect ..."
     Dir.chdir(@options[:start_dir])
 
     cmd "#{@options[:prefix]}/bin/bundle config build.sqlite3 " +

data/installer/unix-like/rho_connect_install_yum.rb

@@ -36,8 +36,8 @@ class Yum
 
     #start installing
     install_all_gems
-    configure_passenger @options
-
+    configure_nginx @options
+    
     #install rhoconnect
     install_rhoconnect
 

data/installer/utils/constants.rb

@@ -17,14 +17,14 @@ module Constants
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'ubuntu'}
-                
+
   CENTOS_STACK    = { :image_id  => 'ami-13346656',
                       :flavor_id => 'c1.medium',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'root'}
 
-  STACKS          = [ UBUNTU_STACK, 
+  STACKS          = [ UBUNTU_STACK,
                       CENTOS_STACK ]
 
   DEB_DEPS        = [ "build-essential",
@@ -34,11 +34,11 @@ module Constants
                       "libreadline5-dev",
                       "libsqlite3-0",
                       "libsqlite3-dev" ]
-  
+
   RPM_DEPS        = [ "gcc-c++",
                       "zlib-devel",
                       "curl-devel",
                       "pcre-devel",
                       "openssl-devel",
-                      "readline-devel" ] 
+                      "readline-devel" ]
 end #Constants

data/installer/utils/create_sha1.rb

@@ -23,4 +23,4 @@ Find.find(dir) do |path|
 end #do
 
 Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
-File.open("#{dest_dir}/checksum", 'w') { |f| f.write(dir_digest) }
+File.open("#{dest_dir}/checksum", 'w') { |f| f.write(dir_digest) }