shifting to a new model of separate couchdb dirs, one for 1.6.x and one for...

shifting to a new model of separate couchdb dirs, one for 1.6.x and one for 2.x, and removing the now obsolete Docker stuff in the top directory

conf/options.json.sample

-{
-   "server": {
-    "ip": "localhost",
-    "port": 80,
-    "secureport": "",
-    "privkey": "",
-    "fullchain": ""
-  },
-  "log": {
-	  "couchwatch": {
-		  "level": 7,
-		  "file": "/tmp/couchwatch.log"
-	  },
-	  "twitters": {
-		  "level": 7,
-		  "file": "/tmp/twitters.log"
-	  },
-	  "server": {
-		  "level": 7,
-		  "file": "/tmp/wenotes-server.log"
-	  }
-  }
-}

conf/run.sh

-#!/bin/bash
-# Bash hasn't been initialized yet so add path to composer manually.
-#export PATH="$HOME/.composer/vendor/bin:$PATH"
-
-# Run start script.
-echo "*****Running run.sh"
-CONF=/root/conf
-COUCH=/root
-WENOTES=/opt/wenotes
-CWD=`pwd`
-# Defines
-WESERVER=https://kiwilightweight@bitbucket.org/wikieducator/wenotes-server.git
-WETOOLS=https://kiwilightweight@bitbucket.org/wikieducator/wenotes-tools.git
-GIT=`which git`
-NPM=`which npm`
-PM2=`which pm2`
-CP=`which cp`
-
-echo "CWD=$CWD, GIT=$GIT"
-
-# Run before-run scripts added by another containers.
-if [[ -d $CONF/before-start ]] ; then
-  FILES=$CONF/before-start/*
-  for f in $FILES
-  do
-    echo "Attaching: $f"
-    source $f
-  done
-fi
-
-
-if [[ -f $CONF/pre-install.sh ]] ; then
-  echo "Running: pre-install.sh"
-  source $CONF/pre-install.sh
-fi
-
-echo "starting services"
-
-# first start couchdb
-if [[ -f $COUCH/couchdb-init.sh ]] ; then
-    echo "starting couchdb via $COUCH/couchdb-init.sh"
-    $PM2 start --no-daemon $COUCH/couchdb-init.sh
-fi
-
-# next, get the Javascript code:
-# get the repo
-echo "moving to $WENOTES"
-cd $WENOTES
-echo "getting $WESERVER, putting it into server"
-$GIT clone $WESERVER server
-# get the repo
-echo "getting $WETOOLS, putting it into server"
-$GIT clone $WETOOLS tools
-# set up options.json
-
-
-# next start various Javascript services
-if [[ -f $CONF/faye.yml ]] ; then
-    echo "moving to server"
-    cd $WENOTES/server
-    echo "installing Node.JS dependencies"
-    $NPM install
-    $CP $CONF/options.json.sample options.json
-    echo "starting pm2 to supervise scripts in $CONF/faye.yml"
-    $PM2 start --no-daemon $CONF/faye.yml
-    cd $WENOTES
-fi
-
-# next start various Javascript services
-if [[ -f $CONF/services.yml ]] ; then
-    cd $WENOTES/tools
-    echo "installing Node.JS dependencies"
-    $NPM install
-    $CP $CONF/options.json.sample options.json
-    echo "starting pm2 to supervise scripts in $CONF/services.yml"
-    $PM2 start --no-daemon $CONF/services.yml
-    cd $WENOTES
-fi
-
-echo "returning to original dir: $CWD"
-cd $CWD
-
-echo "finished services"
-
-if [[ -f $CONF/post-install.sh ]] ; then
-  echo "Running: post-install.sh"
-  source $CONF/post-install.sh
-fi
-echo "\n****** in run.sh ********\n"
-
-# Run after-run scripts added by another containers.
-if [[ -d $CONF/after-start ]] ; then
-  FILES=$CONF/after-start/*
-  for f in $FILES
-  do
-    echo "Attaching: $f"
-    source $f
-  done
-fi