merge with latest dev version

3 files changed, 96 insertions, 0 deletions

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf b/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf
new file mode 100644
index 00000000..d8966f71
--- /dev/null
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf
@@ -0,0 +1,38 @@
+# -----------------------------------------------------------------------------
+# Copyright (c) 2009..2013 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org
+# -----------------------------------------------------------------------------
+# smb.conf
+#     - basic samba configuration file for OpenSLX host-internal networking
+################################################################################
+[global]
+  workgroup = OPENSLX
+  netbios name = HOMESERVER
+  security = SHARE
+  server string = Home and Print Provider
+  bind interfaces only = Yes
+  interfaces = nat1
+  pid directory = /run/samba
+
+[userhome]
+  comment = Home Directory of USER
+  path = /home/USER/PERSISTENT
+  create mask = 0700
+  guest ok = No
+  read only = No
+
+[scratch]
+  comment = Host System Temp Folder
+  path = /tmp
+  create mask = 0700
+  guest ok = Yes
+  read only = No
+  browseable = Yes
+
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf b/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf
new file mode 100644
index 00000000..bca1397c
--- /dev/null
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf
@@ -0,0 +1,54 @@
+# Copyright (c) 2013 - OpenSLX GmbH 
+# 
+# This program is free software distributed under the GPL version 2. 
+# See http://openslx.org/COPYING 
+# 
+# If you have any feedback please consult http://openslx.org/feedback and 
+# send your suggestions, praise, or complaints to feedback@openslx.org 
+# 
+# General information about OpenSLX can be found at http://openslx.org/ 
+# -----------------------------------------------------------------------------
+# udhcpd.conf
+#    - This is the udhcpd configuration file servicing the nat1 interface for
+#      the various virtualization services. DNSSERVER and DOMAIN are replaced
+#      before deamon start in systemd script.
+################################################################################
+
+# start and end of the IP lease block
+start           192.168.101.20
+end             192.168.101.100
+max_leases      80
+
+# interface that udhcpd will use
+interface       nat1
+
+# how long an offered address is reserved (leased) in seconds
+offer_time      6000
+
+# location of the leases file
+lease_file      /var/lib/udhcpd/udhcpd-nat1.leases
+
+# location of the pid file
+pidfile         /var/run/udhcpd-nat1.pid
+
+option  dns     DNSSERVER
+option  subnet  255.255.255.0
+option  router  192.168.101.1
+option  wins    192.168.101.10
+option  domain  DOMAIN virtual.site
+option  lprsrv  192.168.101.1
+#option ntpsrv  NTPSERVER
+
+# additional options known to udhcpd not used in OpenSLX at the moment
+#subnet                 #timezone
+#router                 #timesvr
+#namesvr                #dns
+#logsvr                 #cookiesvr
+#lprsvr                 #bootsize
+#domain                 #swapsvr
+#rootpath               #ipttl
+#mtu                    #broadcast
+#wins                   #lease
+#ntpsrv                 #tftp
+#bootfile               #wpad
+
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/vmchooser.conf b/core/modules/run-virt/data/opt/openslx/vmchooser/config/vmchooser.conf
new file mode 100644
index 00000000..b4355880
--- /dev/null
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/vmchooser.conf
@@ -0,0 +1,4 @@
+theme=bwlehrpool
+pvs=0
+base=/mnt/vmstore
+