Merge pull request 'main' (#1 ) from vv01f/simplekolecalc:main into main

Reviewed-on: siehm/simplekolecalc#1
2023-04-03 14:02:42 +02:00
5 changed files with 27 additions and 658 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,22 +0,0 @@
 kind: pipeline
 name: default
 type: docker
 trigger:
  event:
    - push
  branch:
    - main
 steps:
  - name: build-simplekolecalc
    image: plugins/docker
    settings:
      dockerfile: build/frontend/Dockerfile
      repo: registry.wtf-eg.net/wtf/simplekolecalc
      registry: registry.wtf-eg.net
      username:
        from_secret: "docker_username"
      password:
        from_secret: "docker_password"
--- a/README.md
+++ b/README.md
@ -2,8 +2,6 @@
 Sehr einfacher Rechner um Einnahmen und Betrag der Richtung KoLe-Konto fließen kann abzuschätzen.
 Der Rechner ist unter https://rechner.wtf-eg.de/ eurem persönlichem LDAP-Login der WTF verfügbar.
 ## Disclaimer
 Keine Garantie auf Korrektheit.
@ -13,12 +11,12 @@ Die tatsächlichen Beträge können insbesondere weiteren Abgaben und Steuern un
 Solange die Datei nicht auf einem Webserver online liegt, lässt sie sich auf dem eigenen Rechner direkt offline nutzen.
-Dazu schlicht im Repository die rohe `kole.html` (Schaltfläche „Raw“) aufrufen, auf dem eigenen Gerät speichern und lokal im Browser öffnen. 
+Dazu schlicht im Repository die rohe [kole.html](https://git.wtf-eg.de/vv01f/simplekolecalc/raw/branch/main/kole.html) aufrufen, auf dem eigenen Gerät speichern und im Browser öffnen. 
 ## Verbesserungen
-Sehr willkommen sind Beiträge über Pullrequests oder Diskussionen in den Issues. Wenn das Gitea nicht so sehr liegt, gerne auch [im Foren-Thread](https://forum.wtf-eg.de/t/brutto-nette-rechner-fuer-geno-interna/919) oder eine Nachricht im Forum an Beteiligte schreiben.
+Sehr willkommen sind Beiträge über Pullrequests oder Diskussionen in den Issues. Wenn das Gitea nicht so sehr lieht, gerne auch [im Foren-Thread](https://forum.wtf-eg.de/t/brutto-nette-rechner-fuer-geno-interna/919) oder eine Nachricht im Forum an Beteiligte schreiben.
 ## Beitragende
--- a/build/frontend/Dockerfile
+++ b/build/frontend/Dockerfile
@ -1,3 +0,0 @@
 FROM httpd:2.4-alpine
 COPY ./kole.html /usr/local/apache2/htdocs/index.html
 COPY ./build/frontend/httpd.conf /usr/local/apache2/conf/httpd.conf
--- a/build/frontend/httpd.conf
+++ b/build/frontend/httpd.conf
@ -1,556 +0,0 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
 # See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
 # In particular, see 
 # <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders.  If you are unsure
 # consult the online docs. You have been warned.  
 #
 # Configuration and logfile names: If the filenames you specify for many
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
 # with "/", the value of ServerRoot is prepended -- so "logs/access_log"
 # with ServerRoot set to "/usr/local/apache2" will be interpreted by the
 # server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" 
 # will be interpreted as '/logs/access_log'.
 #
 # ServerRoot: The top of the directory tree under which the server's
 # configuration, error, and log files are kept.
 #
 # Do not add a slash at the end of the directory path.  If you point
 # ServerRoot at a non-local disk, be sure to specify a local disk on the
 # Mutex directive, if file-based mutexes are used.  If you wish to share the
 # same ServerRoot for multiple httpd daemons, you will need to change at
 # least PidFile.
 #
 ServerRoot "/usr/local/apache2"
 #
 # Mutex: Allows you to set the mutex mechanism and mutex file directory
 # for individual mutexes, or change the global defaults
 #
 # Uncomment and change the directory if mutexes are file-based and the default
 # mutex file directory is not on a local disk or is not appropriate for some
 # other reason.
 #
 # Mutex default:logs
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, instead of the default. See also the <VirtualHost>
 # directive.
 #
 # Change this to Listen on specific IP addresses as shown below to 
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
 Listen 80
 #
 # Dynamic Shared Object (DSO) Support
 #
 # To be able to use the functionality of a module which was built as a DSO you
 # have to place corresponding `LoadModule' lines at this location so the
 # directives contained in it are actually available _before_ they are used.
 # Statically compiled modules (those listed by `httpd -l') do not need
 # to be loaded here.
 #
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
 LoadModule mpm_event_module modules/mod_mpm_event.so
 #LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
 #LoadModule mpm_worker_module modules/mod_mpm_worker.so
 #LoadModule authn_file_module modules/mod_authn_file.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
 #LoadModule authn_anon_module modules/mod_authn_anon.so
 #LoadModule authn_dbd_module modules/mod_authn_dbd.so
 #LoadModule authn_socache_module modules/mod_authn_socache.so
 LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_user_module modules/mod_authz_user.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
 #LoadModule authz_owner_module modules/mod_authz_owner.so
 #LoadModule authz_dbd_module modules/mod_authz_dbd.so
 LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
 #LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
 LoadModule access_compat_module modules/mod_access_compat.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
 #LoadModule auth_form_module modules/mod_auth_form.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
 #LoadModule allowmethods_module modules/mod_allowmethods.so
 #LoadModule isapi_module modules/mod_isapi.so
 #LoadModule file_cache_module modules/mod_file_cache.so
 #LoadModule cache_module modules/mod_cache.so
 #LoadModule cache_disk_module modules/mod_cache_disk.so
 #LoadModule cache_socache_module modules/mod_cache_socache.so
 #LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 #LoadModule socache_dbm_module modules/mod_socache_dbm.so
 #LoadModule socache_memcache_module modules/mod_socache_memcache.so
 #LoadModule socache_redis_module modules/mod_socache_redis.so
 #LoadModule watchdog_module modules/mod_watchdog.so
 #LoadModule macro_module modules/mod_macro.so
 #LoadModule dbd_module modules/mod_dbd.so
 #LoadModule bucketeer_module modules/mod_bucketeer.so
 #LoadModule dumpio_module modules/mod_dumpio.so
 #LoadModule echo_module modules/mod_echo.so
 #LoadModule example_hooks_module modules/mod_example_hooks.so
 #LoadModule case_filter_module modules/mod_case_filter.so
 #LoadModule case_filter_in_module modules/mod_case_filter_in.so
 #LoadModule example_ipc_module modules/mod_example_ipc.so
 #LoadModule buffer_module modules/mod_buffer.so
 #LoadModule data_module modules/mod_data.so
 #LoadModule ratelimit_module modules/mod_ratelimit.so
 LoadModule reqtimeout_module modules/mod_reqtimeout.so
 #LoadModule ext_filter_module modules/mod_ext_filter.so
 #LoadModule request_module modules/mod_request.so
 #LoadModule include_module modules/mod_include.so
 LoadModule filter_module modules/mod_filter.so
 #LoadModule reflector_module modules/mod_reflector.so
 #LoadModule substitute_module modules/mod_substitute.so
 #LoadModule sed_module modules/mod_sed.so
 #LoadModule charset_lite_module modules/mod_charset_lite.so
 #LoadModule deflate_module modules/mod_deflate.so
 #LoadModule xml2enc_module modules/mod_xml2enc.so
 #LoadModule proxy_html_module modules/mod_proxy_html.so
 #LoadModule brotli_module modules/mod_brotli.so
 LoadModule mime_module modules/mod_mime.so
 LoadModule ldap_module modules/mod_ldap.so
 LoadModule log_config_module modules/mod_log_config.so
 #LoadModule log_debug_module modules/mod_log_debug.so
 #LoadModule log_forensic_module modules/mod_log_forensic.so
 #LoadModule logio_module modules/mod_logio.so
 #LoadModule lua_module modules/mod_lua.so
 LoadModule env_module modules/mod_env.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 #LoadModule expires_module modules/mod_expires.so
 LoadModule headers_module modules/mod_headers.so
 #LoadModule ident_module modules/mod_ident.so
 #LoadModule usertrack_module modules/mod_usertrack.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 LoadModule setenvif_module modules/mod_setenvif.so
 LoadModule version_module modules/mod_version.so
 #LoadModule remoteip_module modules/mod_remoteip.so
 #LoadModule proxy_module modules/mod_proxy.so
 #LoadModule proxy_connect_module modules/mod_proxy_connect.so
 #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
 #LoadModule proxy_http_module modules/mod_proxy_http.so
 #LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
 #LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
 #LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
 #LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
 #LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_express_module modules/mod_proxy_express.so
 #LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
 #LoadModule session_module modules/mod_session.so
 #LoadModule session_cookie_module modules/mod_session_cookie.so
 #LoadModule session_crypto_module modules/mod_session_crypto.so
 #LoadModule session_dbd_module modules/mod_session_dbd.so
 #LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
 #LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
 #LoadModule ssl_module modules/mod_ssl.so
 #LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
 #LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
 #LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
 #LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
 #LoadModule dialup_module modules/mod_dialup.so
 #LoadModule http2_module modules/mod_http2.so
 #LoadModule proxy_http2_module modules/mod_proxy_http2.so
 #LoadModule md_module modules/mod_md.so
 #LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
 #LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
 #LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
 #LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
 LoadModule unixd_module modules/mod_unixd.so
 #LoadModule heartbeat_module modules/mod_heartbeat.so
 #LoadModule heartmonitor_module modules/mod_heartmonitor.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule status_module modules/mod_status.so
 #LoadModule autoindex_module modules/mod_autoindex.so
 #LoadModule asis_module modules/mod_asis.so
 #LoadModule info_module modules/mod_info.so
 #LoadModule suexec_module modules/mod_suexec.so
 <IfModule !mpm_prefork_module>
 	#LoadModule cgid_module modules/mod_cgid.so
 </IfModule>
 <IfModule mpm_prefork_module>
 	#LoadModule cgi_module modules/mod_cgi.so
 </IfModule>
 #LoadModule dav_fs_module modules/mod_dav_fs.so
 #LoadModule dav_lock_module modules/mod_dav_lock.so
 #LoadModule vhost_alias_module modules/mod_vhost_alias.so
 #LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule dir_module modules/mod_dir.so
 #LoadModule imagemap_module modules/mod_imagemap.so
 #LoadModule actions_module modules/mod_actions.so
 #LoadModule speling_module modules/mod_speling.so
 #LoadModule userdir_module modules/mod_userdir.so
 #LoadModule alias_module modules/mod_alias.so
 #LoadModule rewrite_module modules/mod_rewrite.so
 <IfModule unixd_module>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
 #
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
 # running httpd, as with most system services.
 #
 User www-data
 Group www-data
 </IfModule>
 # 'Main' server configuration
 #
 # The directives in this section set up the values used by the 'main'
 # server, which responds to any requests that aren't handled by a
 # <VirtualHost> definition.  These values also provide defaults for
 # any <VirtualHost> containers you may define later in the file.
 #
 # All of these directives may appear inside <VirtualHost> containers,
 # in which case these default settings will be overridden for the
 # virtual host being defined.
 #
 #
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
 ServerAdmin admin@wtf-eg.de
 #
 # ServerName gives the name and port that the server uses to identify itself.
 # This can often be determined automatically, but we recommend you specify
 # it explicitly to prevent problems during startup.
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
 #ServerName www.example.com:80
 #
 # Deny access to the entirety of your server's filesystem. You must
 # explicitly permit access to web content directories in other 
 # <Directory> blocks below.
 #
 <Directory />
    AllowOverride none
    Require all denied
 </Directory>
 #
 # Note that from this point forward you must specifically allow
 # particular features to be enabled - so if something's not working as
 # you might expect, make sure that you have specifically enabled it
 # below.
 #
 #
 # DocumentRoot: The directory out of which you will serve your
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
 DocumentRoot "/usr/local/apache2/htdocs"
 <Directory "/usr/local/apache2/htdocs">
    #
    # Possible values for the Options directive are "None", "All",
    # or any combination of:
    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
    #
    # Note that "MultiViews" must be named *explicitly* --- "Options All"
    # doesn't give it to you.
    #
    # The Options directive is both complicated and important.  Please see
    # http://httpd.apache.org/docs/2.4/mod/core.html#options
    # for more information.
    #
    Options Indexes FollowSymLinks
    #
    # AllowOverride controls what directives may be placed in .htaccess files.
    # It can be "All", "None", or any combination of the keywords:
    #   AllowOverride FileInfo AuthConfig Limit
    #
    AllowOverride None
    #
    # Controls who can get stuff from this server.
    #
    Require valid-user
    AuthName "WTF-Login"
    AuthType Basic
    AuthBasicProvider ldap
    AuthLDAPURL ${LDAP_AUTH_URL}
    AuthLDAPBindDN ${LDAP_AUTH_BIND_DN}
    AuthLDAPBindPassword ${LDAP_AUTH_BIND_PASSWORD}
 </Directory>
 #
 # DirectoryIndex: sets the file that Apache will serve if a directory
 # is requested.
 #
 <IfModule dir_module>
    DirectoryIndex index.html
 </IfModule>
 #
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
 #
 <Files ".ht*">
    Require all denied
 </Files>
 #
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
 # container, error messages relating to that virtual host will be
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
 ErrorLog /proc/self/fd/2
 #
 # LogLevel: Control the number of messages logged to the error_log.
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
 #
 LogLevel warn
 <IfModule log_config_module>
    #
    # The following directives define some format nicknames for use with
    # a CustomLog directive (see below).
    #
    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
    LogFormat "%h %l %u %t \"%r\" %>s %b" common
    <IfModule logio_module>
      # You need to enable mod_logio.c to use %I and %O
      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
    </IfModule>
    #
    # The location and format of the access logfile (Common Logfile Format).
    # If you do not define any access logfiles within a <VirtualHost>
    # container, they will be logged here.  Contrariwise, if you *do*
    # define per-<VirtualHost> access logfiles, transactions will be
    # logged therein and *not* in this file.
    #
    CustomLog /proc/self/fd/1 common
    #
    # If you prefer a logfile with access, agent, and referer information
    # (Combined Logfile Format) you can use the following directive.
    #
    #CustomLog "logs/access_log" combined
 </IfModule>
 <IfModule alias_module>
    #
    # Redirect: Allows you to tell clients about documents that used to 
    # exist in your server's namespace, but do not anymore. The client 
    # will make a new request for the document at its new location.
    # Example:
    # Redirect permanent /foo http://www.example.com/bar
    #
    # Alias: Maps web paths into filesystem paths and is used to
    # access content that does not live under the DocumentRoot.
    # Example:
    # Alias /webpath /full/filesystem/path
    #
    # If you include a trailing / on /webpath then the server will
    # require it to be present in the URL.  You will also likely
    # need to provide a <Directory> section to allow access to
    # the filesystem path.
    #
    # ScriptAlias: This controls which directories contain server scripts. 
    # ScriptAliases are essentially the same as Aliases, except that
    # documents in the target directory are treated as applications and
    # run by the server when requested rather than as documents sent to the
    # client.  The same rules about trailing "/" apply to ScriptAlias
    # directives as to Alias.
    #
    ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
 </IfModule>
 <IfModule cgid_module>
    #
    # ScriptSock: On threaded servers, designate the path to the UNIX
    # socket used to communicate with the CGI daemon of mod_cgid.
    #
    #Scriptsock cgisock
 </IfModule>
 #
 # "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
 <Directory "/usr/local/apache2/cgi-bin">
    AllowOverride None
    Options None
    Require all granted
 </Directory>
 <IfModule headers_module>
    #
    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
    # backend servers which have lingering "httpoxy" defects.
    # 'Proxy' request header is undefined by the IETF, not listed by IANA
    #
    RequestHeader unset Proxy early
 </IfModule>
 <IfModule mime_module>
    #
    # TypesConfig points to the file containing the list of mappings from
    # filename extension to MIME-type.
    #
    TypesConfig conf/mime.types
    #
    # AddType allows you to add to or override the MIME configuration
    # file specified in TypesConfig for specific file types.
    #
    #AddType application/x-gzip .tgz
    #
    # AddEncoding allows you to have certain browsers uncompress
    # information on the fly. Note: Not all browsers support this.
    #
    #AddEncoding x-compress .Z
    #AddEncoding x-gzip .gz .tgz
    #
    # If the AddEncoding directives above are commented-out, then you
    # probably should define those extensions to indicate media types:
    #
    AddType application/x-compress .Z
    AddType application/x-gzip .gz .tgz
    #
    # AddHandler allows you to map certain file extensions to "handlers":
    # actions unrelated to filetype. These can be either built into the server
    # or added with the Action directive (see below)
    #
    # To use CGI scripts outside of ScriptAliased directories:
    # (You will also need to add "ExecCGI" to the "Options" directive.)
    #
    #AddHandler cgi-script .cgi
    # For type maps (negotiated resources):
    #AddHandler type-map var
    #
    # Filters allow you to process content before it is sent to the client.
    #
    # To parse .shtml files for server-side includes (SSI):
    # (You will also need to add "Includes" to the "Options" directive.)
    #
    #AddType text/html .shtml
    #AddOutputFilter INCLUDES .shtml
 </IfModule>
 #
 # The mod_mime_magic module allows the server to use various hints from the
 # contents of the file itself to determine its type.  The MIMEMagicFile
 # directive tells the module where the hint definitions are located.
 #
 #MIMEMagicFile conf/magic
 #
 # Customizable error responses come in three flavors:
 # 1) plain text 2) local redirects 3) external redirects
 #
 # Some examples:
 #ErrorDocument 500 "The server made a boo boo."
 #ErrorDocument 404 /missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"
 #ErrorDocument 402 http://www.example.com/subscription_info.html
 #
 #
 # MaxRanges: Maximum number of Ranges in a request before
 # returning the entire resource, or one of the special
 # values 'default', 'none' or 'unlimited'.
 # Default setting is to accept 200 Ranges.
 #MaxRanges unlimited
 #
 # EnableMMAP and EnableSendfile: On systems that support it, 
 # memory-mapping or the sendfile syscall may be used to deliver
 # files.  This usually improves server performance, but must
 # be turned off when serving from networked-mounted 
 # filesystems or if support for these functions is otherwise
 # broken on your system.
 # Defaults: EnableMMAP On, EnableSendfile Off
 #
 #EnableMMAP off
 #EnableSendfile on
 # Supplemental configuration
 #
 # The configuration files in the conf/extra/ directory can be 
 # included to add extra features or to modify the default configuration of 
 # the server, or you may simply copy their contents here and change as 
 # necessary.
 # Server-pool management (MPM specific)
 #Include conf/extra/httpd-mpm.conf
 # Multi-language error messages
 #Include conf/extra/httpd-multilang-errordoc.conf
 # Fancy directory listings
 #Include conf/extra/httpd-autoindex.conf
 # Language settings
 #Include conf/extra/httpd-languages.conf
 # User home directories
 #Include conf/extra/httpd-userdir.conf
 # Real-time info on requests and configuration
 #Include conf/extra/httpd-info.conf
 # Virtual hosts
 #Include conf/extra/httpd-vhosts.conf
 # Local access to the Apache HTTP Server Manual
 #Include conf/extra/httpd-manual.conf
 # Distributed authoring and versioning (WebDAV)
 #Include conf/extra/httpd-dav.conf
 # Various default settings
 #Include conf/extra/httpd-default.conf
 # Configure mod_proxy_html to understand HTML4/XHTML1
 <IfModule proxy_html_module>
 Include conf/extra/proxy-html.conf
 </IfModule>
 # Secure (SSL/TLS) connections
 #Include conf/extra/httpd-ssl.conf
 #
 # Note: The following must must be present to support
 #       starting without SSL on platforms with no /dev/random equivalent
 #       but a statically compiled-in mod_ssl.
 #
 <IfModule ssl_module>
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
--- a/kole.html
+++ b/kole.html
@ -2,7 +2,7 @@
 <html>
 <head>
 	<title>Rechner zwischen Brutto-Netto-KoLe</title>
-	<link rel="stylesheet" href="https://wtf-eg.de/css/style.css"/>
+	<link rel="stylesheet" href="https://wtf-eg.de/css/style.css?h=56fa462e"/>
 <style>
 <!--
 	@media only screen {
@ -21,7 +21,9 @@
 			font-size: 1.2em;
 		}
 	}
-
+<!--
 	body { font-family: sans-serif; }
 -->
 	#wrap {
 		display: inline-block;
 	}
@ -49,15 +51,6 @@
 		text-align: center;
 		margin: 1ex auto 2ex auto;
 	}
 	#center_footer {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 	.footnotes {
 		margin-top: 1em;
 		font-size: 0.9em;
 	}
 </style>
 </head>
 <body>
@ -69,55 +62,43 @@
 <fieldset>
 	<legend></legend>
 	<section class="radiogroup">
-		<legend>Eingangsgr&ouml;&szlig;e</legend><!--
+		<legend>Eingangsgröße</legend>
-		--><input accesskey="b" type="radio" name="b" value="e" id="bb" class="bb" checked="checked"/>&nbsp;<label for="bb"><u>B</u>rutto</label><!--
+		<input accesskey="b" type="radio" name="b" value="e" id="bb" class="bb" checked="checked"/><label for="bb"><u>B</u>rutto</label><input accesskey="n" type="radio" name="b" value="b" id="bn" class="bb"/><label for="bn"><u>N</u>etto</label><input accesskey="k" type="radio" name="b" value="k" id="bk" class="bb"/><label for="bk"><u>K</u>oLe</label>
 		--><input accesskey="n" type="radio" name="b" value="b" id="bn" class="bb"/>&nbsp;<label for="bn"><u>N</u>etto</label><!--
 		--><input accesskey="k" type="radio" name="b" value="k" id="bk" class="bb"/>&nbsp;<label for="bk"><u>K</u>oLe</label>
 	</section>
 	<section>
 		<div>
-			<label for="e">Br<u>u</u>tto</label>
+		<label for="e">Br<u>u</u>tto</label>
-			<input accesskey="u" type="number" step="0.01" id="e" value="100.00"/>&thinsp;&euro;
+		<input accesskey="u" type="number" step="0.01" id="e" value="100.00"/>&thinsp;€
 		</div>
 		<div>
-			<label for="u">Umsatzsteuersatz</label>
+		<label for="u">Umsatzsteuersatz</label>
-			<input type="number" step="0.01" id="u" value="19.00"/>&thinsp;%
+		<input type="number" step="0.01" id="u" value="19.00"/>&thinsp;%
 		</div>
 		<div>
-			<label for="us">Umsatzsteuer</label>
+		<label for="us">Umsatzsteuer</label>
-			<input readonly="readonly" type="number" step="0.01" id="us" value="0.00"/>&thinsp;&euro;
+		<input readonly="readonly" type="number" step="0.01" id="us" value="0.00"/>&thinsp;€
 		</div>
 		<div>
-			<label for="n">N<u>e</u>tto</label>
+		<label for="n">N<u>e</u>tto</label>
-			<input accesskey="e" type="number" step="0.01" id="n" value="0.00"/>&thinsp;&euro;
+		<input accesskey="e" type="number" step="0.01" id="n" value="0.00"/>&thinsp;€
 		</div>
 		<div>
-			<label for="ec">Entropie-Tarif&#x202F;&sup1;</label><!-- ggf. k&uuml;nftig Grundlage wie Handbuch/Dokumentation verlinken -->
+		<label for="z">Entropieumlagesatz</label>
-			<select id="ec">
+		<input type="number" step="0.01" id="z" value="23.00"/>&thinsp;%
 				<option value="l" accesskey="l" name="low">Umsatz &leq; 15.000&nbsp;&euro;</option><!-- low: <=1 TEUR -->
 				<option value="h" accesskey="h" name="high">Umsatz &gt; 15.000&nbsp;&euro;</option><!-- high: >1 TEUR -->
 				<option value="c" accesskey="c" name="custom">nach&nbsp;Vereinbarung</option><!-- custom: separate agreement -->
 			</select>
 		</div>
 		<div>
-			<label for="z">Entropieumlagesatz</label>
+		<label for="eu">Entropieumlage</label>
-			<input type="number" step="0.01" id="z" value="20.00"/>&thinsp;%
+		<input readonly="readonly" type="number" step="0.01" id="eu" value="23.00"/>&thinsp;€
 		</div>
 		<div>
-			<label for="eu">Entropieumlage</label>
+		<label for="k">K<u>o</u>Le</label>
-			<input readonly="readonly" type="number" step="0.01" id="eu" value="20.00"/>&thinsp;&euro;
+		<input accesskey="o" type="number" step="0.01" id="k" value="0.00"/>&thinsp;€
 		</div>
 		<div>
 			<label for="k">K<u>o</u>Le</label>
 			<input accesskey="o" type="number" step="0.01" id="k" value="0.00"/>&thinsp;&euro;
 		</div>
 	</section>
 	<section>
-		<button accesskey="r" id="b" type="button">Be<u>r</u>echnen</button>
+		<button accesskey="c" id="b" type="button">Bere<u>c</u>hnen</button>
 	</section>
-	<div class="footnotes">
+
 		&sup1;&#x202F;Es wird der monatliche Umsatz zugrunde gelegt.
 	</div>
 </fieldset>
 	<script>
@ -128,11 +109,10 @@
 		var z=document.getElementById('z');
 		var eu=document.getElementById('eu');
 		var k=document.getElementById('k');
-		var bb=document.getElementById('bb');
+		var bb=document.getElementById('bb'); 
-		var bn=document.getElementById('bn');
+		var bn=document.getElementById('bn'); 
-		var bk=document.getElementById('bk');
+		var bk=document.getElementById('bk'); 
 		var s = document.getElementById('b');
 		var c = document.getElementById('ec');
 		function getFormFloat(f){
 			return parseFloat(f.value);
@ -157,36 +137,8 @@
 		});
 		e.addEventListener('change', function(){bb.checked = true;});
 		n.addEventListener('change', function(){bn.checked = true;});
 		c.addEventListener('change', function(){
 			var selInd=this.selectedIndex;
 			console.log('Entropie-Tarif: '+selInd+'('+z.disabled+': '+z.value+')');
 			switch(selInd){
 				case 0: //low: <15.000 EUR revenue
 					//20.0 %
 					z.value='20.00';
 					z.disabled=true;
 					break;;
 				case 1: //high: >15.000 EUR revenue
 					//15 %
 					z.disabled=true;
 					z.value='15.0';
 					break;;
 				case 2: //custom: according toseparate agreement
 					z.disabled=false;
 					//~ z.focus();
 					break;;
 			}
 		});
 		// set entropy tax to standard value
 		c.selectedIndex=0;
 		z.value='20.00';
 		z.disabled=true;
 		// calc
 		s.click();
 	</script>
 	<div id="center_footer">
 	<p>Der Quellcode befindet sich unter <a href="https://git.wtf-eg.de/wtf-eg/simplekolecalc">https://git.wtf-eg.de/wtf-eg/simplekolecalc</a>. </p>
 	</div>
 	</div>
 </body>
 </html>