ydim-html 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee09b798191d17c79bab0c40951673370c348de5
-  data.tar.gz: 4a7975881b9814e1d91bc3c769346906b2dc777a
+  metadata.gz: d74b5692ac1c39d6a5e7982bb974ebcdcbbcfc41
+  data.tar.gz: 089fbc977d6989daba7f4bd04dbfd23d1be09579
 SHA512:
-  metadata.gz: 1606eafd2dfc822e4f728ceca73ad7318a4462f585bda697a545d194f313a0b7705dc18c5fc3e807dc61c9cd58b68300683d288df44f714b5e533139e9dabd90
-  data.tar.gz: 16df3caa011d98485306b329c8ce15f094e3b296c0a488b8c9f04c128359e93af70c095fbfd3455cac928ba55c6331dc5d6ec1b2e660c0969003f2d0eef65ccf
+  metadata.gz: bf2cf5a85a04e73b34bc995704e0305458a1dbe113320724483cacc0f64fdfb50940c44a3b65b8be2ad40faad8dfb566da4882785fa9e8ec9d4d245f9b9e5e27
+  data.tar.gz: 4aeeb8d4ca419dc16672d2933b053dfdb379c3e4a7dc011da62f7c57046382ea85366ae6e2ebe8c63d96858a3226d7e8ff3adc4ba0418a5eb96d42bba772311e

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.2 / 2016-05-12
+
+* Added example_site and explanation in readme.md on how to setup ydim-html
+* Trying to fix problem Uninitialized constant #<Module:0x000000028db358>::DRb (NameError) using ::Drb
+* Set YDIM_VERSION to YDIM::Html::VERSION instead of (non existing commit-id)
+* Added example_site/install_needed_sw.sh
+
 === 1.0.1 / 2016-05-10
 
 * Updated to use Ruby 2.3.0

data/bin/ydim-htmld

@@ -10,11 +10,12 @@ require 'logger'
 require 'ydim/server'
 require 'ydim/html/util/server'
 require 'ydim/html/config'
+require 'ydim/html/version'
 
 module YDIM
   module Html
     headpath = File.expand_path('../.git/HEAD', File.dirname(__FILE__))
-    YDIM_VERSION = File.read(headpath).strip
+    YDIM_VERSION = YDIM::Html::VERSION
 
     DRb.start_service(@config.proxy_url)
 

data/doc/index.rbx

@@ -4,7 +4,7 @@
 require 'sbsm/request'
 load 'etc/config.rb'
 
-DRb.start_service('druby://localhost:0')
+::DRb.start_service('druby://localhost:0')
 
 begin
 	config = YDIM::Html::Util::CONFIG

data/etc/config.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# etc/config -- ydim -- 12.01.2006 -- hwyss@ywesee.com
+
+require 'rclconf'
+require 'digest/md5'
+
+module YDIM
+        module Html
+                module Util
+ydim_default_dir = '/var/ydim/'
+if(home = ENV['HOME'])
+        ydim_default_dir = File.join(home, '.ydim')
+end
+default_config_files = [
+        File.join(ydim_default_dir, 'ydim-htmld.yml'),
+        '/etc/ydim/ydim-htmld.yml',
+]
+defaults = {
+        'config'                                        => default_config_files,
+        'client_url'                    => 'druby://localhost:0',
+        'currency'                              => 'CHF',
+        'email'                                         => 'zdavatz@ywesee.com',
+        'html_url'                              => 'druby://localhost:12376',
+        'md5_pass'                              => nil,
+        'proxy_url'                             => 'druby://localhost:0',
+        'server_url'                    => 'druby://localhost:12375', 
+        'root_key'                              => '/etc/ydim/id_dsa',
+        'user'                                          => nil,
+        'ydim_dir'                              => nil,
+}
+config = RCLConf::RCLConf.new(ARGV, defaults)
+config.load(config.config)
+
+CONFIG = config
+                end
+        end
+end
+

data/etc/trans_handler.yml

@@ -0,0 +1,48 @@
+---
+shortcut: 
+  '/medikamente': 
+    'language': 'de'
+    'event': 'home_drugs'
+  '/medicaments':
+    'language': 'fr'
+    'event': 'home_drugs'
+  '/drugs': 
+    'language': 'en'
+    'event': 'home_drugs'
+  '/interaktionen': 
+    'language': 'de'
+    'event': 'home_interactions'
+  '/interactions': 
+    'language': 'en'
+    'event': 'home_interactions'
+  '/firmen': 
+    'language': 'de'
+    'event': 'home_companies'
+  '/entreprises': 
+    'language': 'fr'
+    'event': 'home_companies'
+  '/companies': 
+    'language': 'en'
+    'event': 'home_companies'
+  '/aerzte_schweiz': 
+    'language': 'de'
+    'event': 'home_doctors'
+  '/medecins_suisses': 
+    'language': 'fr'
+    'event': 'home_doctors'
+  '/doctors_switzerland':
+    'language': 'en'
+    'event': 'home_doctors'
+  '/services': 
+    'event': 'home_user'
+  '/wirkstoffe': 
+    'language': 'de'
+    'event': 'home_substances'
+  '/principes_actifs': 
+    'language': 'fr'
+    'event': 'home_substances'
+  '/substances': 
+    'language': 'en'
+    'event': 'home_substances'
+  '/admin': 
+    'event': 'home_admin'

data/example_site/etc/apache/modules.d/21_mod_ruby.conf

@@ -0,0 +1,26 @@
+<IfDefine RUBY>
+LoadModule ruby_module /usr/lib64/apache2/modules/mod_ruby.so
+# LoadModule ruby_module /usr/lib64/apache2/modules/mod_ruby193-p547.so
+# LoadModule ruby_module /usr/lib64/apache2/modules/mod_ruby193.so
+# LoadModule ruby_module /usr/lib64/apache2/modules/mod_ruby219.so
+
+# RubyRequire apache/ruby-debug
+RubyRequire apache/ruby-run
+
+# exec files under /ruby as ruby scripts.
+<Location /ruby>
+	SetHandler ruby-object
+	RubyHandler Apache::RubyRun.instance
+	Options ExecCGI
+</Location>
+
+# exec *.rbx as ruby scripts.
+<Files *.rbx>
+	SetHandler ruby-object
+	RubyHandler Apache::RubyRun.instance
+#	RubyHandler Apache::RubyDebug.instance
+</Files>
+
+</IfDefine>
+
+# vim: ts=4 filetype=apache

data/example_site/etc/apache/vhosts.d/ydim.ywesee.com.conf

@@ -0,0 +1,40 @@
+<Directory /var/www/ydim.ywesee.com/doc>
+Options ExecCGI
+AllowOverride None
+Order allow,deny
+Allow from all
+SSLRequireSSL
+ErrorDocument 403 https://ydim.oddb-ci2.dyndns.org
+</Directory>
+
+<VirtualHost 172.25.1.75:443>
+DocumentRoot /var/www/ydim.ywesee.com/doc
+ServerName ydim.oddb-ci2.dyndns.org
+DirectoryIndex index.rbx
+RubyAddPath /var/www/ydim.ywesee.com/
+RubyAddPath /usr/local/lib64/ruby/gems/1.9.1/gems/sbsm-1.2.3/lib
+RubyAddPath /usr/local/lib64/ruby/gems/1.9.1/gems/rclconf-1.0.0/lib
+#RubyRequire 'apache/ruby-debug'
+RubyRequire 'sbsm/trans_handler'
+SetHandler ruby-object
+RubyTransHandler SBSM::TransHandler.instance
+ErrorLog "|/usr/sbin/cronolog -l /var/www/ydim.ywesee.com/log/error_log /var/www/ydim.ywesee.com/log/%Y/%m/%d/error_log"
+CustomLog "|/usr/sbin/cronolog -l /var/www/ydim.ywesee.com/log/access_log /var/www/ydim.ywesee.com/log/%Y/%m/%d/access_log" combined
+SSLEngine on
+SSLCertificateFile /etc/ssl/apache2/server.crt
+SSLCertificateKeyFile /etc/ssl/apache2/server.key
+</VirtualHost>
+
+## webalizer
+<Directory "/var/www/ydim.ywesee.com/webalizer">
+Options None
+AllowOverride None
+Order allow,deny
+Allow from all
+</Directory>
+
+<VirtualHost *:80>
+DocumentRoot /var/www/ydim.ywesee.com/webalizer
+ServerName webalizer.ydim.ywesee.com
+DirectoryIndex index.html
+</VirtualHost>

data/example_site/etc/ydim/ydim-htmld.yml

@@ -0,0 +1,5 @@
+---
+email: ngiger@ywesee.com
+md5_pass: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+root_key: '/etc/ydim/id_dsa'
+

data/example_site/etc/ydim/ydimd.yml

@@ -0,0 +1,31 @@
+---
+log_level: DEBUG
+
+mail_from: 'Niklaus Giger (ydim) <user@example.com>'
+mail_recipients:
+- 'user@example.com'
+server_url: druby://localhost:12375
+smtp_from: 'user@example.com'
+email: 'user@example.com'
+root_key: '/etc/ydim/id_dsa'
+
+root_email:  'user@example.com'
+md5_pass: Digest::MD5.hexdigest('aaaaaaaaaaaaaaaaaaa')
+
+smtp_server: smtp.gmail.com
+smtp_domain: example.com
+smtp_user:  example@example.com
+smtp_pass:  topsecret
+smtp_port: 587
+
+mail_body: |
+ %s %s
+
+ Anbei die Rechnung für %s.
+
+ Besten Dank für Ihren Auftrag!
+
+ Mit freundlichen Grüssen
+ Some User
+ phone number:
+

data/example_site/install_needed_sw.sh

@@ -0,0 +1,103 @@
+#!/bin/bash -v
+set -e
+export SRC_ROOT=/usr/local/src
+export RUBY_19_VERSION=1.9.3-p547
+export SUFFIX_19=`echo ${RUBY_19_VERSION} | awk '{gsub(/\./,"")}; 1'`
+export RUBY_2_VERSION=2.3.1
+export RUBY_2_SUFFIX=`echo ${RUBY_2_VERSION} | awk '{gsub(/\./,"")}; 1'`
+export PATH=/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.4
+export RUBY=/usr/local/bin/ruby${SUFFIX_19}
+
+# Install Ruby 1.9.3 for Apache mod_ruby
+function show_vars {
+  if [ -f  $RUBY ]; then
+    ls -l $RUBY
+    $RUBY --version
+  fi
+  for item in RUBY SRC_ROOT RUBY_19_VERSION SUFFIX_19 PATH RUBY_2_VERSION RUBY_2_SUFFIX
+  do
+    echo "${item}=${!item}"
+  done
+}
+
+function install_ruby_19 {
+  if [ ! -d ${SRC_ROOT}/ruby-${RUBY_19_VERSION} ]
+  then
+    cd ${SRC_ROOT}
+    pwd
+    # rm -rf ruby-${RUBY_19_VERSION}
+    if [ ! -f ruby-${RUBY_19_VERSION}.tar.gz ]
+    then
+      wget https://ftp.ruby-lang.org/pub/ruby/ruby-${RUBY_19_VERSION}.tar.gz
+    fi
+    tar -zxf ruby-${RUBY_19_VERSION}.tar.gz
+  fi
+  cd $SRC_ROOT/ruby-${RUBY_19_VERSION}
+  if [ -f Makefile ]; then
+    make  distclean
+  fi
+  # Adding --enable-shared leads to
+  # apache2: Syntax error on line 155 of /etc/apache2/httpd.conf: Syntax error on line 3 of  \
+  # /etc/apache2/modules.d/21_mod_ruby.conf: Cannot load /usr/lib64/apache2/modules/mod_ruby193-p547.so into server:
+  # /usr/lib64/apache2/modules/mod_ruby193-p547.so: undefined symbol: ruby_dln_librefs
+  ./configure --prefix=/usr/local --disable-install-doc --enable-shared --program-suffix=${SUFFIX_19} --libdir=/usr/local/lib 2>&1 | tee configure.log
+  make -j9 2>&1 | tee make.log
+  sudo make install 2>&1 | tee install.log
+}
+
+function install_ruby_2 {
+  if [ ! -d ${SRC_ROOT}/ruby-${RUBY_2_VERSION} ]
+  then
+    cd ${SRC_ROOT}
+    pwd
+    if [ ! -f ruby-${RUBY_2_VERSION}.tar.gz ]
+    then
+      wget https://ftp.ruby-lang.org/pub/ruby/ruby-${RUBY_2_VERSION}.tar.gz
+    fi
+    ls -lrt
+    tar -zxf ruby-${RUBY_2_VERSION}.tar.gz
+  fi
+
+  cd $SRC_ROOT/ruby-${RUBY_2_VERSION}
+  if [ -f Makefile ]; then
+    make  distclean
+  fi
+  ./configure --prefix=/usr/local --disable-install-doc --enable-shared --program-suffix=${RUBY_2_SUFFIX} --libdir=/usr/local/lib 2>&1 | tee configure.log
+  make -j9 2>&1 | tee make.log
+  sudo make install 2>&1 | tee install.log
+}
+
+function install_mod_ruby {
+  # from http://dev.ywesee.com/Niklaus/20160413-ydim-html
+  #  /usr/bin/ruby ./configure.rb --with-apr-includes=/usr/include/apr-1 --with-apxs=/usr/sbin/apxs I
+  if [ ! -d ${SRC_ROOT}/mod_ruby ]
+  then
+    cd ${SRC_ROOT}
+    git clone https://github.com/shugo/mod_ruby
+  fi
+  cd $SRC_ROOT/mod_ruby
+  git pull
+  if [ -f Makefile ]; then
+    make  distclean
+  fi
+  # --with-apxs=/usr/sbin/apxs Build shared Apache module.
+  # --with-apache Build static Apache module
+  #
+  $RUBY ./configure.rb \
+    --with-apxs=/usr/sbin/apxs \
+    --with-apr-includes=/usr/include/apr-1 \
+    --prefix=/usr/local \
+    --libdir=/usr/local/lib64 2>&1 | tee configure.log
+  make 2>&1 | tee make.log
+  sudo make install 2>&1 | tee install.log
+  sudo cp -v mod_ruby.so /usr/lib64/apache2/modules/mod_ruby${SUFFIX_19}.so
+}
+function install_ydim_html_gems {
+  sudo /usr/local/bin/gem${RUBY_2_SUFFIX} install ydim ydim-html
+}
+show_vars
+install_ruby_19
+install_mod_ruby
+install_ruby_2
+install_ydim_html_gems
+show_vars

data/example_site/service/ydim/log/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+exec multilog t ./main
+

data/example_site/service/ydim/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+ulimit -v 10240000
+cd /home/niklaus/git/ydim
+exec sudo -u apache /usr/local/bin/ydimd

data/example_site/service/ydim-html/log/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+exec multilog t ./main
+

data/example_site/service/ydim-html/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+ulimit -v 10240000
+cd /var/www/ydim.ywesee.com/
+exec sudo -u apache /usr/local/bin/ruby231 bin/ydim-htmld

data/example_site/service/yus/log/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+exec multilog t ./main
+

data/example_site/service/yus/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+ulimit -v 1536000
+cd /usr/local/src/yus18
+exec sudo -u apache RUBYOPT=-rauto_gem /usr/bin/ruby18 bin/yusd

data/lib/ydim/html/version.rb

@@ -2,6 +2,6 @@
 # encoding: utf-8
 module YDIM
   module Html
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/readme.md

@@ -16,6 +16,24 @@ This is an application. Therefore it is not distributed as a gem, instead it has
 
 Currently we have neither working unit tnor spec tests.
 
+## Howto deploy a working site
+
+1. Install apache2
+2. Compile and install ruby 1.9 and mod_ruby
+3. Compile and install ruby >= 2.1.0 and ydim-html gem
+4. Install yus (gem and initialize/load postgres database)
+5. Install ydim (gem and initialize/load postgres database)
+6. We use daemontools (run scripts under example_site/etc/services) to start, supervise and log yus, ydim and ydim-html
+7. Create an id_rsa for ydim using sudo ssh-keygen -t dsa -f /etc/ydim/id_dsa
+   We assume here that you entered 'xxx'.
+   The id_rsa files must belong to the apache user. Therefore sudo chown -R apache /etc/ydim
+8. Calling `ruby -e "require 'digest/md5'; p Digest::MD5::hexdigest(ARGV[0])" xxx` will return "f561aaf6ef0bf14d4208bb46a4ccb3ad"
+9. Change the md5_pass to this value in /etc/ydim/ydim-htmld.yml
+10. Adapt all values in /etc/ydim/*.yml to your needs
+11. Configure apache for use with mod_ruby and ydim-html. See example_site/etc/apache
+
+A bash script for steps 3 and 3 is found under example_site/install_needed_sw.sh.
+
 ## DEVELOPERS:
 
 * Masaomi Hatakeyama

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ydim-html
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm
@@ -213,6 +213,19 @@ files:
 - doc/resources/javascript/iframe_history.html
 - doc/resources/javascript/ydim.js
 - doc/resources/ydim/ydim.css
+- etc/config.rb
+- etc/trans_handler.yml
+- example_site/etc/apache/modules.d/21_mod_ruby.conf
+- example_site/etc/apache/vhosts.d/ydim.ywesee.com.conf
+- example_site/etc/ydim/ydim-htmld.yml
+- example_site/etc/ydim/ydimd.yml
+- example_site/install_needed_sw.sh
+- example_site/service/ydim-html/log/run
+- example_site/service/ydim-html/run
+- example_site/service/ydim/log/run
+- example_site/service/ydim/run
+- example_site/service/yus/log/run
+- example_site/service/yus/run
 - lib/ydim/html.rb
 - lib/ydim/html/config.rb
 - lib/ydim/html/state/ajax_values.rb