Download as
Browse Code »

Commit dcf20626b5503d0e2832808de6b08afc26f2b7db

Authored by Antonio Terceiro
1 parent 685e9913
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Adding a setup action to the initscript

Showing 1 changed file with 14 additions and 10 deletions   Show diff stats
etc/init.d/noosfero
  Diff comments   View file @dcf2062
@@ -50,14 +50,7 @@ main_script() { @@ -50,14 +50,7 @@ main_script() {
50 fi 50 fi
51 } 51 }
52 52
53 -do_start() {  
54 -  
55 - # FIXME should not test for ferret only  
56 - if [ -e $FERRET_PID_FILE ]; then  
57 - echo 'noosfero already running, cannot start.'  
58 - exit 2  
59 - fi  
60 - 53 +do_setup() {
61 # PID directories 54 # PID directories
62 if [ ! -d /var/run/noosfero ]; then 55 if [ ! -d /var/run/noosfero ]; then
63 mkdir /var/run/noosfero 56 mkdir /var/run/noosfero
@@ -89,6 +82,17 @@ do_start() { @@ -89,6 +82,17 @@ do_start() {
89 if [ ! -e $NOOSFERO_DIR/log ]; then 82 if [ ! -e $NOOSFERO_DIR/log ]; then
90 ln -s /var/log/noosfero $NOOSFERO_DIR/log 83 ln -s /var/log/noosfero $NOOSFERO_DIR/log
91 fi 84 fi
  85 +}
  86 +
  87 +do_start() {
  88 +
  89 + # FIXME should not test for ferret only
  90 + if [ -e $FERRET_PID_FILE ]; then
  91 + echo 'noosfero already running, cannot start.'
  92 + exit 2
  93 + fi
  94 +
  95 + do_setup
92 96
93 # actually start the service 97 # actually start the service
94 main_script start 98 main_script start
@@ -111,11 +115,11 @@ do_restart() { @@ -111,11 +115,11 @@ do_restart() {
111 } 115 }
112 116
113 case "$1" in 117 case "$1" in
114 - start|stop|restart) 118 + start|stop|restart|setup)
115 do_$1 119 do_$1
116 ;; 120 ;;
117 *) 121 *)
118 - echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2 122 + echo "Usage: $SCRIPTNAME {start|stop|restart|setup}" >&2
119 exit 3 123 exit 3
120 ;; 124 ;;
121 esac 125 esac