Ovirt devel - Jun 2009 - [PATCH server] added ovirt-vnc-proxy sysconfig

---
 conf/ovirt-vnc-proxy         |    6 ++++--
 conf/ovirt-vnc-proxy.sysconf |    2 ++
 ovirt-server.spec.in         |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 conf/ovirt-vnc-proxy.sysconf

diff --git a/conf/ovirt-vnc-proxy b/conf/ovirt-vnc-proxy
index 00b0652..4c260cb 100755
--- a/conf/ovirt-vnc-proxy
+++ b/conf/ovirt-vnc-proxy
@@ -9,16 +9,18 @@
 #
 
 [ -r /etc/sysconfig/ovirt-rails ] && . /etc/sysconfig/ovirt-rails
+[ -r /etc/sysconfig/ovirt-vnc-proxy ] && .
/etc/sysconfig/ovirt-vnc-proxy
 
 export RAILS_ENV="${RAILS_ENV:-production}"
+export OVIRT_VNC_PROXY_PORT="${OVIRT_VNC_PROXY_PORT:-5900}"
 
-DAEMON=/usr/share/ovirt-server/vnc-proxy/vnc-proxy.rb
+DAEMON=src/vnc-proxy/vnc-proxy.rb
 
 . /etc/init.d/functions
 
 start() {
     echo -n "Starting ovirt-vnc-proxy: "
-    daemon $DAEMON
+    daemon $DAEMON --port $OVIRT_VNC_PROXY_PORT
     RETVAL=$?
     echo
 }
diff --git a/conf/ovirt-vnc-proxy.sysconf b/conf/ovirt-vnc-proxy.sysconf
new file mode 100644
index 0000000..d9fa15a
--- /dev/null
+++ b/conf/ovirt-vnc-proxy.sysconf
@@ -0,0 +1,2 @@
+#sets the port which to listen on
+#OVIRT_VNC_PROXY_PORT=5900
diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 68f3a2e..1569a9a 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -102,6 +102,7 @@ touch
%{buildroot}%{_localstatedir}/log/%{name}/db-omatic.log
 %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-mongrel-rails
%{buildroot}%{_initrddir}
 %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-mongrel-rails.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/ovirt-mongrel-rails
 %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-rails.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/ovirt-rails
+%{__install} -Dp -m0755 %{pbuild}/conf/ovirt-vnc-proxy.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/ovirt-vnc-proxy
 %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-taskomatic
%{buildroot}%{_initrddir}
 %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-vnc-proxy
%{buildroot}%{_initrddir}
 
@@ -213,6 +214,7 @@ fi
 %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/ovirt-mongrel-rails
 %config(noreplace) %{_sysconfdir}/sysconfig/ovirt-rails
+%config(noreplace) %{_sysconfdir}/sysconfig/ovirt-vnc-proxy
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %doc
 %attr(-, ovirt, ovirt) %{_localstatedir}/lib/%{name}
-- 
1.6.0.6

Mohammed Morsi wrote:
> ---
>  conf/ovirt-vnc-proxy         |    6 ++++--
>  conf/ovirt-vnc-proxy.sysconf |    2 ++
>  ovirt-server.spec.in         |    2 ++
>  3 files changed, 8 insertions(+), 2 deletions(-)
>  create mode 100644 conf/ovirt-vnc-proxy.sysconf
>
>   
ACK