Initial version.

diff --git a/temlate.sls b/UltraVNC.sls
similarity index 75%
rename from temlate.sls
rename to UltraVNC.sls
index f452394d221ea267da19652f54cab85295eee274..9b889c27475795240d4b44f6a93a6766ce6b33a2 100644 (file)
--- a/temlate.sls
+++ b/UltraVNC.sls
@@ -11,4 +11,7 @@ PACKAGE:
   pkg:
     - installed
 
-
+copy_file:
+  file.managed:
+    - source: salt://win/repo-ng/UltraVNC/ultravnc.ini
+    - name: '%Programfiles%\UltraVNC\ultravnc.ini'

diff --git a/oss-pkg-UltraVNC.spec.in b/oss-pkg-UltraVNC.spec.in
index cac1ecd41309d1783d44ff11146aec344c5ee197..4084e2e1960c0a36c71cb220e138a6f22d137c31 100644 (file)
--- a/oss-pkg-UltraVNC.spec.in
+++ b/oss-pkg-UltraVNC.spec.in
@@ -14,9 +14,9 @@ Group:        Productivity/
 Source:       %{name}.tar.bz2
 Source1:      vncsnapshot
 Source2:      ultravncpw.pl
-Source3:      get_screen_shots.sh
-Source4:      oss_get_screen_shots.sh
-Source5:      oss_get_screen_shots.service
+Source3:      get_screenshots.sh
+Source4:      oss_get_screenshots.sh
+Source5:      oss_get_screenshots.service
 BuildArch:    noarch
 BuildRequires:unzip
 #Requires:     
@@ -62,13 +62,13 @@ install -m 750 %{SOURCE5} %{buildroot}/usr/lib/systemd/system/
 rm -rf %{buildroot}
 
 %pre
-%service_add_pre oss_get_screen_shots.service
+%service_add_pre oss_get_screenshots.service
 
 %preun
-%service_del_preun oss_get_screen_shots.service
+%service_del_preun oss_get_screenshots.service
 
 %post
-%service_add_post oss_get_screen_shots.service
+%service_add_post oss_get_screenshots.service
 if [ !-e /var/adm/oss/vncpwd/VNCPW1 ]
 then
        VNCPW1=$( mktemp -q XXXXXXXX )
@@ -85,7 +85,7 @@ fi
 /usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}'
 
 %postun
-%service_del_postun oss_get_screen_shots.service
+%service_del_postun oss_get_screenshots.service
 
 %files
 %defattr(644,root,root)

diff --git a/repo-ng/UltraVNC_1_2_22_X64_Setup.exe b/repo-ng/UltraVNC_1_2_22_X64_Setup.exe
new file mode 100755 (executable)
index 0000000..f8a0e0a
Binary files /dev/null and b/repo-ng/UltraVNC_1_2_22_X64_Setup.exe differ

diff --git a/repo-ng/UltraVNC_1_2_22_X86_Setup.exe b/repo-ng/UltraVNC_1_2_22_X86_Setup.exe
new file mode 100755 (executable)
index 0000000..1f5d71a
Binary files /dev/null and b/repo-ng/UltraVNC_1_2_22_X86_Setup.exe differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
new file mode 100644 (file)
index 0000000..01ff46d
--- /dev/null
+++ b/repo-ng/init.sls
@@ -0,0 +1,33 @@
+###############################################################################
+# SLS: UltraVNC
+# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# All rights reserved.
+#
+# Authors:              Helmuth Varkoly
+#
+# Description:          Package SLS
+###############################################################################
+
+{% if grains['cpuarch'] == 'AMD64' %}
+{% set ARCH = "x64" %}
+{% else %}
+{% set ARCH = "x86" %}
+{% endif %}
+
+{% set LOG_PATH = 'C:\\salt\\var\\log' %}
+{% set DESTINATION = '%ProgramFiles%\\UltraVNC'%}
+UltraVNC:
+  '1.2.2.2':
+    {% if ARCH == 'x64' %}
+    installer: salt://win/repo-ng/UltraVNC/UltraVNC_1_2_22_X64_Setup.exe
+    {% else %}
+    installer: salt://win/repo-ng/UltraVNC/UltraVNC_1_2_22_X86_Setup.exe
+    {% endif %}
+    full_name: 'UltraVNC'
+    uninstaller: '{{ DESTINATION }}\unins000.exe'
+    install_flags: '/VERYSILENT /NORESTART /TYPE=custom /COMPONENTS="ultravnc_server_s" /TASKS="installservice,startservice" /LOG={{ LOG_PATH }}\UVNC_inst.log /DIR="{{ DESTINATION }}"'
+    uninstall_flags: '/VERYSILENT /NORESTART /LOG={{ LOG_PATH }}\UVNC_uninst.log'
+    msiexec: False
+    locale: de_DE
+    reboot: False
+    cache_dir: False

diff --git a/server/get_screen_shots.sh b/server/get_screenshots.sh
similarity index 60%
rename from server/get_screen_shots.sh
rename to server/get_screenshots.sh
index 9a82b446734f8594b4d19c8534972abac1f6d226..2a57618d1e34a837a40be5461177663e6a80c208 100755 (executable)
--- a/server/get_screen_shots.sh
+++ b/server/get_screenshots.sh
@@ -6,6 +6,6 @@ if [ -e "$PIDF" ]; then
 fi
 echo $$ > /run/getScreenShots/${CLIENT}
 IP=$( host ${CLIENT} | gawk '{ print $4 }')
-/usr/share/oss/vnc/vncsnapshot -passwd /var/adm/oss/vncpwd/VNCPW1 ${IP} /srv/www/admin/screenShots/${CLIENT}.png &> /dev/null
+/usr/share/oss/vnc/vncsnapshot -quality 20 -passwd /var/adm/oss/vncpwd/VNCPW1 ${IP} /srv/www/admin/screenShots/${CLIENT}.jpg &> /dev/null
 rm -f $PIDF
 

diff --git a/server/oss_get_screen_shots.service b/server/oss_get_screenshots.service
similarity index 86%
rename from server/oss_get_screen_shots.service
rename to server/oss_get_screenshots.service
index 6762f549c76595ef4e058caaff381cca64bbbf9f..25bc0a17896629654b6a731d7a6106d58c6ecbe6 100755 (executable)
--- a/server/oss_get_screen_shots.service
+++ b/server/oss_get_screenshots.service
@@ -6,7 +6,7 @@ After=basic.target network.target syslog.target salt-master.service
 [Service]
 Restart=on-failure
 ExecStartPre=/usr/bin/mkdir -p /srv/www/admin/screenShots
-ExecStart=/usr/sbin/oss_get_screen_shots.sh
+ExecStart=/usr/sbin/oss_get_screenshots.sh
 
 [Install]
 WantedBy=multi-user.target

diff --git a/server/oss_get_screen_shots.sh b/server/oss_get_screenshots.sh
similarity index 100%
rename from server/oss_get_screen_shots.sh
rename to server/oss_get_screenshots.sh