nagira 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a527fc662d7e3b6219167e10099f3c34ffa6e84
-  data.tar.gz: 77ec09dd1e3fab0057f3679168efb249fef63ea1
+  metadata.gz: c09bc3962e430c97414b5e339bda189c34cb799a
+  data.tar.gz: 7eb9575f51aa191a37ba1504b50e65d9a8e2882d
 SHA512:
-  metadata.gz: 8dd228893c307314d2a672a41f8b6a9481f78fbb757b16076c6863b69f1fd8f22cb45aa12e1dc1407530de100a5162921c9f00aa168a01b940bc5d91ad051038
-  data.tar.gz: 4b9a585a556f951961b2435e93a6fecfc8f2a48d9bd57d63a96a8e23276d74ba03ec7aea9b2f8d8dd1a7a982b9ad3334cd44fff34ce5d7d674fa68d6033c1175
+  metadata.gz: 3f7eb07bad39c7498eb7f3d07d6863124dbbf0baa66a4180ebcabebea252434d9c9fba91d4d7348bab223f97d0d442e7be27c77d7e50772d0cbb4ee9f45b9b42
+  data.tar.gz: ece7da05d6591689494b15eea77da1a02dc0e9c1050f6064da5c8d34d33eaaefeccc868ff1617e5e66b1db332f2e4768a20e41379a8e8b216d3792056b5ebca3

data/History.md

@@ -1,3 +1,7 @@
+### v.0.3.1
+* Mon Aug 26 2013 -- Dmytro Kovalov
+  - Bugfix: fix for init.d script to load defaults file
+
 ### v.0.3.0
 * Mon Aug 26 2013 -- Dmytro Kovalov
   - Feature: Configurable hostname regex (see `NAGIOS_HOST_CUSTOM_REGEXi` in `config/nagira.defaults`)

data/config/nagira.init_d

@@ -23,22 +23,19 @@ process_name="Sinatra Nagira services"
 pid_file=/var/run/nagira.pid
 
 
-load_defaults () {
-    which sherlock > /dev/null 2>&1 && eval $(sherlock | grep FAMILY) || { echo "sherlock not found"; exit 2; }
-    
-    case $FAMILY in
-        'rh')
-            DEFAULTS=/etc/sysconfig/nagira ;;
-        'debian')
-            DEFAULTS=/etc/default/nagira ;;
-        *)
-            echo "Unknown OS or distribution version: $FAMILY"
+which sherlock > /dev/null 2>&1 && eval $(sherlock | grep FAMILY) || { echo "sherlock not found"; exit 2; }
+
+case $FAMILY in
+    'rh')
+        DEFAULTS=/etc/sysconfig/nagira ;;
+    'debian')
+        DEFAULTS=/etc/default/nagira ;;
+    *)
+        echo "Unknown OS or distribution version: $FAMILY"
         exit 1
         ;;
-    esac
-    source $DEFAULTS || { echo "Can not load defaults file" ; exit 1 ; }
-}
-
+esac
+source $DEFAULTS || { echo "Can not load defaults file" ; exit 1 ; }
 
 ##
 # Some reasonable defaults if not set in defaults file
@@ -68,8 +65,7 @@ get_pid () {
 start() {
     [ ! -z "$(get_pid)" ] && { status; return 1; }
     echo -n "Starting ${process_name}:    "
-    load_defaults
-    su - $NAGIRA_USER -s /bin/bash -c "$RVM_STRING ;  RACK_ENV=$RACK_ENV nagira&" > $NAGIRA_LOG  2>&1 
+    su - $NAGIRA_USER -s /bin/bash -c "source $DEFAULTS ; $RVM_STRING ;  RACK_ENV=$RACK_ENV nagira&" > $NAGIRA_LOG  2>&1 
     sleep 5
     process=$(get_pid)
     if [ -z "$process" ]; then

data/version.txt

@@ -1 +1 @@
-0.3.0
+0.3.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagira
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmytro Kovalov