Download as
Browse Code »

Commit 665572dde334adb6a48eed31313a35df9583abad

Authored by Rodrigo Souto
1 parent 28aa08c2
Exists in master and in 8 other branches cherry-pick-62193d8b, federation, gemfile-changes, rails4, rails5, stable-1.2, stable-1.3, stable-1.5

Removing solr form init.d 

Also improving script to use pgrep to check if noosfero is running
instead of solr's pid.
Showing 1 changed file with 16 additions and 27 deletions   Show diff stats
etc/init.d/noosfero
  Diff comments   View file @665572d
... ... @@ -45,14 +45,13 @@ if [ -z "$NOOSFERO_DIR" ] || [ -z "$NOOSFERO_USER" ]; then
45 45 fi
46 46  
47 47 ######################
48   -SOLR_PID_FILE=$NOOSFERO_DIR/tmp/pids/solr.production.pid
49 48  
50 49 main_script() {
51 50 cd $NOOSFERO_DIR
52 51 if [ "$NOOSFERO_USER" != "$USER" ]; then
53   - su $NOOSFERO_USER -l -c "SOLR_DATA_PATH=/var/lib/noosfero-data/index ./script/production $1"
  52 + su $NOOSFERO_USER -l -c "./script/production $1"
54 53 else
55   - SOLR_DATA_PATH=/var/lib/noosfero-data/index ./script/production $1
  54 + ./script/production $1
56 55 fi
57 56 }
58 57  
... ... @@ -78,13 +77,6 @@ do_setup() {
78 77 chmod 750 /var/tmp/noosfero
79 78 fi
80 79  
81   - # Solr directory
82   - if [ ! -d /var/tmp/noosfero/solr ]; then
83   - mkdir -p /var/tmp/noosfero/solr
84   - chown $NOOSFERO_USER:root /var/tmp/noosfero/solr
85   - chmod 750 /var/tmp/noosfero/solr
86   - fi
87   -
88 80 # symlink the directories into Noosfero directory
89 81 if [ ! -e $NOOSFERO_DIR/tmp ]; then
90 82 ln -s /var/tmp/noosfero $NOOSFERO_DIR/tmp
... ... @@ -98,28 +90,21 @@ do_setup() {
98 90 }
99 91  
100 92 do_start() {
101   -
102   - # FIXME should not test for solr only
103   - if [ -e $SOLR_PID_FILE ]; then
104   - echo 'noosfero already running, cannot start.'
105   - exit 2
  93 + if ! running; then
  94 + do_setup
  95 + # actually start the service
  96 + main_script start
  97 + else
  98 + echo 'Noosfero is already running, nothing to do...'
106 99 fi
107   -
108   - do_setup
109   -
110   - # actually start the service
111   - main_script start
112 100 }
113 101  
114 102 do_stop() {
115   -
116   - # FIXME should not test for solr only
117   - if [ ! -e $SOLR_PID_FILE ]; then
118   - echo 'noosfero not running, cannot stop'
119   - exit 2
  103 + if running; then
  104 + main_script stop
  105 + else
  106 + echo 'Noosfero is already stopped, nothing to do...'
120 107 fi
121   -
122   - main_script stop
123 108 }
124 109  
125 110 do_restart() {
... ... @@ -127,6 +112,10 @@ do_restart() {
127 112 do_start
128 113 }
129 114  
  115 +running(){
  116 + pgrep -u noosfero -f server > /dev/null
  117 +}
  118 +
130 119 case "$1" in
131 120 start|stop|restart|setup)
132 121 do_$1
... ...