Permalink
Browse files

include /etc/default/wakame-vdc in /etc/default/vdc-*.

  • Loading branch information...
hansode committed Apr 18, 2012
1 parent f6aa638 commit 1ec98886a3e88a0227a4983292f30ee838ab770d
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## agent params
#AMQP_ADDR=127.0.0.1
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## rack params
RACK_ENV=development
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## agent params
#AMQP_ADDR=127.0.0.1
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## rack params
RACK_ENV=development
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## agent params
#AMQP_ADDR=127.0.0.1
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## agent specified
#AMQP_ADDR=127.0.0.1
@@ -1,11 +1,8 @@
-# Comment out to run the lxc init script
-#RUN=yes
-
-## vdc
-VDC_ROOT=/opt/axsh/wakame-vdc
+# source common params
+[ -f /etc/default/wakame-vdc ] && . /etc/default/wakame-vdc
-## for debug
-#DAEMON_COREFILE_LIMIT=unlimited
+# Comment out to run the vdc init script
+#RUN=yes
## rack params
RACK_ENV=development
@@ -0,0 +1,8 @@
+## vdc
+VDC_ROOT=/opt/axsh/wakame-vdc
+
+## PATH
+PATH=${VDC_ROOT}/ruby/bin:${PATH}
+
+## for debug
+#DAEMON_COREFILE_LIMIT=unlimited
@@ -127,8 +127,8 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
%{prefix}/%{name}/
-%dir %{prefix}/%{name}/
%config /etc/logrotate.d/flog-vdc
+%config(noreplace) /etc/default/wakame-vdc
%files dcmgr-vmapp-config
%defattr(-,root,root)

0 comments on commit 1ec9888

Please sign in to comment.