Download as
Browse Code »

Commit 1d20b6f8a8e9e1cfbc88a2c7b9a332a3d5ddf762

Authored by Antonio Terceiro
2 parents 9ff5859c 8571cfc9
Exists in master and in 19 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements, xss_terminate_custom_options

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
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
plugins/stoa/script/stoa-auth-server
  Diff comments   View file @1d20b6f
... ... @@ -25,7 +25,7 @@
25 25 # PATH should only include /usr/* if it runs after the mountnfs.sh script
26 26 PATH=/sbin:/usr/sbin:/bin:/usr/bin
27 27 DESC="Stoa authentication deamon"
28   -NAME=stoa-auth-daemon
  28 +NAME=stoa-auth-server
29 29 SCRIPTNAME=/etc/init.d/$NAME
30 30  
31 31 # default values
... ... @@ -33,8 +33,8 @@ NOOSFERO_DIR=/var/lib/noosfero/current
33 33 NOOSFERO_USER=noosfero
34 34  
35 35 # Read configuration variable file if it is present
36   -if [ -r /etc/default/$NAME ]; then
37   - . /etc/default/$NAME
  36 +if [ -r /etc/default/noosfero ]; then
  37 + . /etc/default/noosfero
38 38 else
39 39 # for running from development setup, or from git with the script symlinked
40 40 script=$(readlink -f $0)
... ...