From dd02a316aca0c324d7eb79c0b4bb1baa8f2e5f03 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Fri, 7 May 2010 18:40:38 -0300
Subject: [PATCH] Making sure Noosfero starts after a forced reboot

---
 config/ferret_server.yml.dist |  8 ++++----
 etc/init.d/noosfero           | 35 ++++++++++++++++++++++++++++++++++-
 etc/logrotate.d/noosfero      |  2 +-
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/config/ferret_server.yml.dist b/config/ferret_server.yml.dist
index d00a370..d30aa2a 100644
--- a/config/ferret_server.yml.dist
+++ b/config/ferret_server.yml.dist
@@ -1,16 +1,16 @@
 production:
   host: localhost
   port: 9011
-  pid_file: log/ferret.pid
+  pid_file: tmp/pids/ferret.production.pid
 #development:
 #  host: localhost
 #  port: 9010
-#  pid_file: log/ferret.pid
+#  pid_file: tmp/pids/ferret.development.pid
 #test:
 #  host: localhost
 #  port: 9009
-#  pid_file: log/ferret.pid
+#  pid_file: tmp/pids/ferret.test.pid
 staging:
   host: localhost
   port: 9011
-  pid_file: log/ferret.pid
+  pid_file: tmp/pids/ferret.staging.pid
diff --git a/etc/init.d/noosfero b/etc/init.d/noosfero
index 582a728..19f1c75 100755
--- a/etc/init.d/noosfero
+++ b/etc/init.d/noosfero
@@ -39,7 +39,7 @@ if [ -z $NOOSFERO_DIR ] || [ -z $NOOSFERO_USER ]; then
 fi
 
 ######################
-FERRET_PID_FILE=$NOOSFERO_DIR/log/ferret.pid
+FERRET_PID_FILE=$NOOSFERO_DIR/tmp/pids/ferret.production.pid
 
 main_script() {
   cd $NOOSFERO_DIR
@@ -58,6 +58,39 @@ do_start() {
     exit 2
   fi
 
+  # PID directories
+  if [ ! -d /var/run/noosfero ]; then
+    mkdir /var/run/noosfero
+    chown $NOOSFERO_USER:root /var/run/noosfero
+    chmod 755 /var/run/noosfero
+  fi
+
+  # Noosfero logs
+  if [ ! -d /var/log/noosfero ]; then
+    mkdir /var/log/noosfero
+    chown $NOOSFERO_USER:root /var/log/noosfero
+    chmod 750 /var/log/noosfero
+  fi
+
+  # Noosfero tmp directory
+  if [ ! -d /var/tmp/noosfero ]; then
+    mkdir /var/tmp/noosfero
+    chown $NOOSFERO_USER:root /var/tmp/noosfero
+    chmod 750 /var/tmp/noosfero
+  fi
+
+  # symlink the directories into Noosfero directory
+  if [ ! -e $NOOSFERO_DIR/tmp ]; then
+    ln -s /var/tmp/noosfero $NOOSFERO_DIR/tmp
+  fi
+  if [ ! -e $NOOSFERO_DIR/tmp/pids ]; then
+    ln -s /var/run/noosfero $NOOSFERO_DIR/tmp/pids
+  fi
+  if [ ! -e $NOOSFERO_DIR/log ]; then
+    ln -s /var/log/noosfero $NOOSFERO_DIR/log
+  fi
+
+  # actually start the service
   main_script start
 }
 
diff --git a/etc/logrotate.d/noosfero b/etc/logrotate.d/noosfero
index 474c7c4..aee11ff 100644
--- a/etc/logrotate.d/noosfero
+++ b/etc/logrotate.d/noosfero
@@ -1,4 +1,4 @@
-/var/lib/noosfero/current/log/*.log /home/noosfero/current/log/*.log {
+/var/log/noosfero/*.log /home/noosfero/current/log/*.log {
         daily
         missingok
         rotate 30
--
libgit2 0.21.2