diff --git a/README.md b/README.md index 3f8e67f51..38b753362 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Getting Started ``` root@shell> cd /opt/ - root@shell> tar -xzvf zammad-1.0.1.tar.gz + root@shell> tar -xzf zammad-1.0.1.tar.gz root@shell> useradd zammad zammad@shell> su - zammad ``` @@ -26,17 +26,17 @@ Getting Started ``` zammad@shell> cd zammad - zammad@shell> sudo gem install rails + zammad@shell> gem install rails zammad@shell> vi Gemfile # enable libv8, execjs and therubyracer if needed! zammad@shell> sudo bundle install ``` -3. Configure your databases (if needed) +3. Configure your databases ``` zammad@shell> cp config/database.yml.dist config/database.yml zammad@shell> vi config/database.yml -```` +``` 4. Initialize your database diff --git a/script/init-script-normal-user-rvm-fedora b/script/init-script-normal-user-rvm-fedora index 532b41191..404f9e627 100755 --- a/script/init-script-normal-user-rvm-fedora +++ b/script/init-script-normal-user-rvm-fedora @@ -21,6 +21,11 @@ NAME=zammad APP_PORT=3000 WS_PORT=6042 +ZAMMAD_CONFIG=/etc/sysconfig/zammad +# Read config +[ -f "$JENKINS_CONFIG" ] && . "$JENKINS_CONFIG" + + # Load RVM into a shell session *as a function* if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then # First try to load from a user install