[Git][noosfero/noosfero][master] 2 commits: Fix Stoa daemon paths and script name variables

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
8571cfc9 by Athos Ribeiro at 2015-12-03T13:55:49Z
Fix Stoa daemon paths and script name variables

Comments in the script tell the user to use /etc/default/noosfero to set
variables used in the script, but it looks for them in
/etc/default/stoa-auth-daemon. Also, the file name variable should be
atoa-auth-server.

- - - - -
1d20b6f8 by Antonio Terceiro at 2015-12-03T16:28:53Z
Merge branch 'stoa-daemon' into 'master'

Fix Stoa daemon paths and script name variables

Comments in the script tell the user to use /etc/default/noosfero to set
variables used in the script, but it looks for them in
/etc/default/stoa-auth-daemon. Also, the file name variable should be
atoa-auth-server.

See merge request !741
- - - - -


1 changed file:

- plugins/stoa/script/stoa-auth-server


Changes:

=====================================
plugins/stoa/script/stoa-auth-server
=====================================
--- a/plugins/stoa/script/stoa-auth-server
+++ b/plugins/stoa/script/stoa-auth-server
@@ -25,7 +25,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Stoa authentication deamon"
-NAME=stoa-auth-daemon
+NAME=stoa-auth-server
 SCRIPTNAME=/etc/init.d/$NAME
 
 # default values
@@ -33,8 +33,8 @@ NOOSFERO_DIR=/var/lib/noosfero/current
 NOOSFERO_USER=noosfero
 
 # Read configuration variable file if it is present
-if [ -r /etc/default/$NAME ]; then
-  . /etc/default/$NAME
+if [ -r /etc/default/noosfero ]; then
+  . /etc/default/noosfero
 else
   # for running from development setup, or from git with the script symlinked
   script=$(readlink -f $0)



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/9ff5859cc607ca8e41d943fa523eef23da4a93e0...1d20b6f8a8e9e1cfbc88a2c7b9a332a3d5ddf762
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151203/2c0458f2/attachment.html>