kvm: deploy http server which allow guest to get files from host directory

slapos/recipe/kvm/template/kvm_run.in

@@ -44,6 +44,7 @@ disk_storage_dict = {}
 disk_storage_list = """%(disk-storage-list)s""".split('\n')
 map_storage_list = []
 etc_directory = '%(etc-directory)s'.strip()
+httpd_port = %(httpd-port)s
 
 def md5Checksum(file_path):
     with open(file_path, 'rb') as fh:
@@ -233,6 +234,11 @@ if tap_network_parameter == [] and nat_network_parameter == []:
 else:
   kvm_argument_list += nat_network_parameter + tap_network_parameter
 
+if httpd_port > 1000:
+  kvm_argument_list.extend([
+  '-net', 'nic', '-net', 'user,guestfwd=tcp:10.0.2.100:80-cmd:netcat %%s %%s' %% (
+      listen_ip, httpd_port)])
+
 for disk in additional_disk_list:
   kvm_argument_list.extend([
             '-drive', 'file=%%s,if=%%s' %% (disk, disk_type)])

software/kvm/common.cfg

@@ -85,7 +85,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 8debca5cccf4c365f8709523aa57e2fb
+md5sum = 5ec81de2b77e32b572f2aa3efd6434a5
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -93,7 +93,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 8c736cf6b5768423224a1b0ea2a90349
+md5sum = 3ea9f211a51ea5e463bf462ed3e16ffb
 download-only = true
 on-update = true
 
@@ -101,7 +101,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = a5c1f0620510a979daf8fd60120f6253
+md5sum = 61fe14ac4b32f84a84c6ef20250741cf
 download-only = true
 on-update = true
 
@@ -165,3 +165,24 @@ url = ${:_profile_base_location_}/instance-frontend.cfg.in
 md5sum = cdb690495e9eb007d2b7d2f8e12f5c59
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644
+
+[template-apache-conf]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/apache.conf.in
+mode = 644
+filename = apache.conf.in
+md5sum = 5abb319093d639afc3d32252dbe1d90d
+download-only = true
+on-update = true
+
+[template-httpd]
+recipe = slapos.recipe.template:jinja2
+filename = template-httpd.cfg
+template = ${:_profile_base_location_}/instance-kvm-http.cfg.in
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/instance-kvm-http.cfg
+md5sum = 84b96dfc78e8d2611bf7210b8b6bb9c5
+context =
+    key apache_location apache:location
+    raw template_apache_conf ${template-apache-conf:location}/${template-apache-conf:filename}
+
+

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -52,6 +52,9 @@ config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-har
 config-external-disk-number = {{ dumps(kvm_parameter_dict.get('external-disk-number', 0)) }}
 config-external-disk-size = {{ dumps(kvm_parameter_dict.get('external-disk-size', 20)) }}
 config-external-disk-format = {{ dumps(kvm_parameter_dict.get('external-disk-format', 'qcow2')) }}
+config-enable-http-server = {{ dumps(kvm_parameter_dict.get('enable-http-server', True)) }}
+config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
+
 return = 
   backend-url
   url

software/kvm/instance-kvm-http.cfg.in

+[buildout]
+
+parts = 
+  httpd
+  httpd-promise
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+bin = ${buildout:directory}/bin
+srv = ${buildout:directory}/srv
+public = ${:srv}/public/
+log = ${:var}/log
+services = ${:etc}/service
+promises = ${:etc}/promise
+run = ${:var}/run
+
+[apache-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ template_apache_conf }}
+rendered = ${directory:etc}/apache.conf
+#ipv6 = ${slap-network-information:global-ipv6}
+ipv4 = ${slap-network-information:local-ipv4}
+port = ${slap-parameter:httpd-port}
+error-log = ${directory:log}/apache-error.log
+access-log = ${directory:log}/apache-access.log
+pid-file = ${directory:run}/apache.pid
+index = ${directory:public}
+context = 
+  key port :port
+  key ip :ipv4
+  key access_log :access-log
+  key error_log :error-log
+  key pid_file :pid-file
+  key index_folder :index
+
+[httpd]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:services}/httpd
+command-line = "{{ apache_location }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
+
+[httpd-promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promises}/apache-httpd
+hostname = ${apache-conf:ipv4}
+port = ${apache-conf:port}
\ No newline at end of file

software/kvm/instance-kvm.cfg.jinja2

@@ -15,6 +15,13 @@ parts =
   cron
 #  cron-entry-monitor
   frontend-promise
+{% if slapparameter_dict.get('enable-http-server', 'False') == 'True' %}
+  httpd
+  httpd-promise
+
+extends = 
+  {{ template_httpd_cfg }}
+{% endif -%}
 
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
@@ -114,6 +121,12 @@ external-disk-number = ${slap-parameter:external-disk-number}
 external-disk-size = ${slap-parameter:external-disk-size}
 external-disk-format = ${slap-parameter:external-disk-format}
 
+{% if slapparameter_dict.get('enable-http-server', 'False') == 'True' %}
+httpd-port = ${slap-parameter:httpd-port}
+{% else -%}
+httpd-port = 0
+{% endif -%}
+
 [kvm-vnc-promise]
 recipe = slapos.cookbook:check_port_listening
 path = ${directory:promises}/vnc_promise
@@ -299,3 +312,6 @@ virtual-hard-drive-gzipped = False
 external-disk-number = 0
 external-disk-size = 20
 external-disk-format = qcow2
+
+enable-http-server = False
+httpd-port = 8081

software/kvm/instance.cfg.in

@@ -87,6 +87,7 @@ context =
     raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
     raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
+    raw template_httpd_cfg ${template-httpd:rendered}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}

software/kvm/template/apache.conf.in

+ServerLimit 2
+StartServers 1
+MaxClients 2
+
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule autoindex_module modules/mod_autoindex.so
+
+Listen {{ ip }}:{{ port }}
+
+PidFile "{{ pid_file }}"
+ServerAdmin admin@
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+ServerTokens Prod
+ServerSignature Off
+TraceEnable Off
+
+ErrorLog "{{ error_log }}"
+# Default apache log format with request time in microsecond at the end
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
+CustomLog "{{ access_log }}" combined
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
+DocumentRoot {{ index_folder }}
+<Directory {{ index_folder }}>
+  Options Indexes FollowSymLinks
+  AllowOverride All
+  Require all granted
+</Directory>
\ No newline at end of file