Fix a lot of typos.

Add start script to open the firewall for vnc.

diff --git a/oss-pkg-UltraVnc.spec.in b/oss-pkg-UltraVnc.spec.in
index 09ca0b50b8ed1b7cd098fff7d57cf848e781560a..8aefbda2215b88fe5919570da4f5c6c57e02c46f 100644 (file)
--- a/oss-pkg-UltraVnc.spec.in
+++ b/oss-pkg-UltraVnc.spec.in
@@ -14,9 +14,10 @@ Group:        Productivity/
 Source:       %{name}.tar.bz2
 Source1:      vncsnapshot
 Source2:      ultravncpw.pl
-Source3:      get_screenshots.sh
+Source3:      get_screenshot.sh
 Source4:      oss_get_screenshots.sh
 Source5:      oss_get_screenshots.service
+Source6:      110-open-fw-for-vnc.sh
 BuildArch:    noarch
 BuildRequires:unzip
 #Requires:     
@@ -48,15 +49,18 @@ cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE
 
 #Server stuff
 mkdir -p %{buildroot}/usr/share/oss/vnc/
-install -m 750 %{SOURCE1} %{buildroot}/usr/share/oss/vnc/
-install -m 750 %{SOURCE2} %{buildroot}/usr/share/oss/vnc/
-install -m 750 %{SOURCE3} %{buildroot}/usr/share/oss/vnc/
+install -m 755 %{SOURCE1} %{buildroot}/usr/share/oss/vnc/
+install -m 755 %{SOURCE2} %{buildroot}/usr/share/oss/vnc/
+install -m 755 %{SOURCE3} %{buildroot}/usr/share/oss/vnc/
+
+mkdir -p %{buildroot}/usr/share/oss/plugins/clients/start/
+install -m 755 %{SOURCE6} %{buildroot}/usr/share/oss/plugins/clients/start/
 
 mkdir -p %{buildroot}/usr/sbin
-install -m 750 %{SOURCE4} %{buildroot}/usr/sbin/
+install -m 755 %{SOURCE4} %{buildroot}/usr/sbin/
 
 mkdir -p %{buildroot}/usr/lib/systemd/system/
-install -m 750 %{SOURCE5} %{buildroot}/usr/lib/systemd/system/
+install -m 755 %{SOURCE5} %{buildroot}/usr/lib/systemd/system/
 
 %clean
 rm -rf %{buildroot}
@@ -99,5 +103,6 @@ systemctl start  oss_get_screenshots.service
 /usr/lib/systemd/system/oss_*
 %defattr(755,root,root)
 /usr/share/oss/vnc
+/usr/share/oss/plugins/clients/start/*
 /usr/sbin/oss_*
 

diff --git a/server/110-open-fw-for-vnc.sh b/server/110-open-fw-for-vnc.sh
new file mode 100755 (executable)
index 0000000..f94cb14
--- /dev/null
+++ b/server/110-open-fw-for-vnc.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright (c) Peter Varkoly <peter@varkoly.de> Nürnberg, Germany.  All rights reserved.
+
+MINION=$1
+
+salt "$MINION" firewall.add_rule 'vnc' '5900' 'tcp'
+

diff --git a/server/oss_get_screenshots.sh b/server/oss_get_screenshots.sh
index 0b7a5155adf0ed304b85e6399f6289a95299715b..3f3e635787d84242b88bfb929a74bf56e64eb86d 100755 (executable)
--- a/server/oss_get_screenshots.sh
+++ b/server/oss_get_screenshots.sh
@@ -8,7 +8,7 @@ do
         if [ -d /var/adm/oss/running/ ]; then
                 for i in $( ls /var/adm/oss/running/ )
                 do
-                        /usr/share/oss/tools/get_screenshot.sh ${i/.$SCHOOL_DOMAIN/} &
+                        /usr/share/oss/vnc/get_screenshot.sh ${i/.$SCHOOL_DOMAIN/} &
                 done
         fi
         sleep 4