From deb3c618fefc745e0bfffbd4f79ecbeec71a0e42 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 22 Mar 2021 18:43:31 +0100 Subject: [PATCH] npm, we need ! --- apps/nodered-deployment.yaml | 2 +- apps/web/almond-cloud/Dockerfile | 4 +- apps/web/rompr/etc_lighthttpd/lighttpd.conf | 335 ------------------ apps/web/rompr/etc_lighthttpd/mime-types.conf | 79 ----- apps/web/rompr/etc_lighthttpd/mod_cgi.conf | 33 -- .../web/rompr/etc_lighthttpd/mod_fastcgi.conf | 17 - .../rompr/etc_lighthttpd/mod_fastcgi_fpm.conf | 16 - apps/web/rompr/etc_lighthttpd/rompr.conf | 15 - 8 files changed, 3 insertions(+), 498 deletions(-) delete mode 100644 apps/web/rompr/etc_lighthttpd/lighttpd.conf delete mode 100644 apps/web/rompr/etc_lighthttpd/mime-types.conf delete mode 100644 apps/web/rompr/etc_lighthttpd/mod_cgi.conf delete mode 100644 apps/web/rompr/etc_lighthttpd/mod_fastcgi.conf delete mode 100644 apps/web/rompr/etc_lighthttpd/mod_fastcgi_fpm.conf delete mode 100644 apps/web/rompr/etc_lighthttpd/rompr.conf diff --git a/apps/nodered-deployment.yaml b/apps/nodered-deployment.yaml index a46a1c9..eb52827 100644 --- a/apps/nodered-deployment.yaml +++ b/apps/nodered-deployment.yaml @@ -75,7 +75,7 @@ kind: PersistentVolumeClaim metadata: name: node-red spec: - storageClassName: nfs-ssd + storageClassName: nfs-ssd-ebin01 accessModes: - ReadWriteOnce resources: diff --git a/apps/web/almond-cloud/Dockerfile b/apps/web/almond-cloud/Dockerfile index f8d6a0c..0abebf3 100644 --- a/apps/web/almond-cloud/Dockerfile +++ b/apps/web/almond-cloud/Dockerfile @@ -8,8 +8,8 @@ RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.li sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list RUN apt-get update && \ - apt-get -y install ${DEVPKGS} python3-pip python3-torch graphicsmagick zip unzip bubblewrap nodejs \ - sqlcipher gettext && \ + apt-get -y install ${DEVPKGS} python3-pip python3-torch graphicsmagick zip unzip bubblewrap \ + sqlcipher gettext nodejs npm && \ pip3 install 'git+https://github.com/stanford-oval/genienlp@3885917258678b8cd38fbd6d9b8488b6ac8caed7#egg=genienlp' #setup diff --git a/apps/web/rompr/etc_lighthttpd/lighttpd.conf b/apps/web/rompr/etc_lighthttpd/lighttpd.conf deleted file mode 100644 index 662df59..0000000 --- a/apps/web/rompr/etc_lighthttpd/lighttpd.conf +++ /dev/null @@ -1,335 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Gentoo. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/lighttpd.conf,v 1.3 2005/09/01 14:22:35 ka0ttic Exp $ -############################################################################### - -# {{{ variables -var.basedir = "/rompr" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" -# }}} - -# {{{ modules -# At the very least, mod_access and mod_accesslog should be enabled. -# All other modules should only be loaded if necessary. -# NOTE: the order of modules is important. -server.modules = ( - "mod_rewrite", - "mod_redirect", - "mod_alias", - "mod_access", -# "mod_cml", -# "mod_trigger_b4_dl", -# "mod_auth", -# "mod_status", -# "mod_setenv", -# "mod_proxy", -# "mod_simple_vhost", -# "mod_evhost", -# "mod_userdir", - "mod_compress", -# "mod_ssi", -# "mod_usertrack", - "mod_expire", -# "mod_secdownload", -# "mod_rrdtool", -# "mod_webdav", -# "mod_accesslog" -) -# }}} - -# {{{ includes -include "mime-types.conf" -# uncomment for cgi support -# include "mod_cgi.conf" -# uncomment for php/fastcgi support -# include "mod_fastcgi.conf" -# uncomment for php/fastcgi fpm support -include "mod_fastcgi_fpm.conf" -# }}} - -# {{{ server settings -server.username = "lighttpd" -server.groupname = "www-data" - -server.document-root = var.basedir -server.pid-file = "/run/lighttpd.pid" - -#server.errorlog = "/dev/pts/0" -# log errors to syslog instead -# server.errorlog-use-syslog = "enable" - -server.indexfiles = ("index.php") - -# server.tag = "lighttpd" - -server.follow-symlink = "enable" - -# ROMPR -# Expire header for RompR albumart -expire.url = ( "/albumart/" => "modification plus 1 seconds" ) -# This sets the 404 page globally for the server which is OK if you're only -# running RompR but will affect other sites on your system. -# If you have other sites on this system then you should maybe look at virtual hosts. -# If you don't use the custom 404 page for RompR your album art manager will -# not work correctly. -server.error-handler-404 = "404.php" -# ROMPR END - -# event handler (defaults to "poll") -# see performance.txt -# -# for >= linux-2.4 -# server.event-handler = "linux-rtsig" -# for >= linux-2.6 -# server.event-handler = "linux-sysepoll" -# for FreeBSD -# server.event-handler = "freebsd-kqueue" - -# chroot to directory (defaults to no chroot) -# server.chroot = "/" - -# bind to port (defaults to 80) -# server.port = 81 - -# bind to name (defaults to all interfaces) -# server.bind = "grisu.home.kneschke.de" - -# error-handler for status 404 -# server.error-handler-404 = "/error-handler.html" -# server.error-handler-404 = "/error-handler.php" - -# Format: .html -# -> ..../status-404.html for 'File not found' -# server.errorfile-prefix = var.basedir + "/error/status-" - -# FAM support for caching stat() calls -# requires that lighttpd be built with USE=fam -# server.stat-cache-engine = "fam" -# }}} - -# {{{ mod_staticfile - -# which extensions should not be handled via static-file transfer -# (extensions that are usually handled by mod_cgi, mod_fastcgi, etc). -static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi") -# }}} - -# {{{ mod_accesslog -# accesslog.filename = "/dev/pts/0" -# }}} - -# {{{ mod_dirlisting -# enable directory listings -# dir-listing.activate = "enable" -# -# don't list hidden files/directories -# dir-listing.hide-dotfiles = "enable" -# -# use a different css for directory listings -# dir-listing.external-css = "/path/to/dir-listing.css" -# -# list of regular expressions. files that match any of the -# specified regular expressions will be excluded from directory -# listings. -# dir-listing.exclude = ("^\.", "~$") -# }}} - -# {{{ mod_access -# see access.txt - -url.access-deny = ("~", ".inc") -# }}} - -# {{{ mod_userdir -# see userdir.txt -# -# userdir.path = "public_html" -# userdir.exclude-user = ("root") -# }}} - -# {{{ mod_ssi -# see ssi.txt -# -# ssi.extension = (".shtml") -# }}} - -# {{{ mod_ssl -# see ssl.txt -# -# ssl.engine = "enable" -# ssl.pemfile = "server.pem" -# }}} - -# {{{ mod_status -# see status.txt -# -# status.status-url = "/server-status" -# status.config-url = "/server-config" -# }}} - -# {{{ mod_simple_vhost -# see simple-vhost.txt -# -# If you want name-based virtual hosting add the next three settings and load -# mod_simple_vhost -# -# document-root = -# virtual-server-root + virtual-server-default-host + virtual-server-docroot -# or -# virtual-server-root + http-host + virtual-server-docroot -# -# simple-vhost.server-root = "/home/weigon/wwwroot/servers/" -# simple-vhost.default-host = "grisu.home.kneschke.de" -# simple-vhost.document-root = "/pages/" -# }}} - -# {{{ mod_compress -# see compress.txt -# -compress.cache-dir = "/tmp" -compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" ) - -# }}} - -# {{{ mod_proxy -# see proxy.txt -# -# proxy.server = ( ".php" => -# ( "localhost" => -# ( -# "host" => "192.168.0.101", -# "port" => 80 -# ) -# ) -# ) -# }}} - -# {{{ mod_auth -# see authentication.txt -# -# auth.backend = "plain" -# auth.backend.plain.userfile = "lighttpd.user" -# auth.backend.plain.groupfile = "lighttpd.group" - -# auth.backend.ldap.hostname = "localhost" -# auth.backend.ldap.base-dn = "dc=my-domain,dc=com" -# auth.backend.ldap.filter = "(uid=$)" - -# auth.require = ( "/server-status" => -# ( -# "method" => "digest", -# "realm" => "download archiv", -# "require" => "user=jan" -# ), -# "/server-info" => -# ( -# "method" => "digest", -# "realm" => "download archiv", -# "require" => "valid-user" -# ) -# ) -# }}} - -# {{{ mod_rewrite -# see rewrite.txt -# -# url.rewrite = ( -# "^/$" => "/server-status" -# ) -# }}} - -# {{{ mod_redirect -# see redirect.txt -# -# url.redirect = ( -# "^/wishlist/(.+)" => "http://www.123.org/$1" -# ) -# }}} - -# {{{ mod_evhost -# define a pattern for the host url finding -# %% => % sign -# %0 => domain name + tld -# %1 => tld -# %2 => domain name without tld -# %3 => subdomain 1 name -# %4 => subdomain 2 name -# -# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/" -# }}} - -# {{{ mod_expire -# expire.url = ( -# "/buggy/" => "access 2 hours", -# "/asdhas/" => "access plus 1 seconds 2 minutes" -# ) -# }}} - -# {{{ mod_rrdtool -# see rrdtool.txt -# -# rrdtool.binary = "/usr/bin/rrdtool" -# rrdtool.db-name = var.statedir + "/lighttpd.rrd" -# }}} - -# {{{ mod_setenv -# see setenv.txt -# -# setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) -# setenv.add-response-header = ( "X-Secret-Message" => "42" ) -# }}} - -# {{{ mod_trigger_b4_dl -# see trigger_b4_dl.txt -# -# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db" -# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) -# trigger-before-download.trigger-url = "^/trigger/" -# trigger-before-download.download-url = "^/download/" -# trigger-before-download.deny-url = "http://127.0.0.1/index.html" -# trigger-before-download.trigger-timeout = 10 -# }}} - -# {{{ mod_cml -# see cml.txt -# -# don't forget to add index.cml to server.indexfiles -# cml.extension = ".cml" -# cml.memcache-hosts = ( "127.0.0.1:11211" ) -# }}} - -# {{{ mod_webdav -# see webdav.txt -# -# $HTTP["url"] =~ "^/dav($|/)" { -# webdav.activate = "enable" -# webdav.is-readonly = "enable" -# } -# }}} - -# {{{ extra rules -# -# set Content-Encoding and reset Content-Type for browsers that -# support decompressing on-thy-fly (requires mod_setenv) -# $HTTP["url"] =~ "\.gz$" { -# setenv.add-response-header = ("Content-Encoding" => "x-gzip") -# mimetype.assign = (".gz" => "text/plain") -# } - -# $HTTP["url"] =~ "\.bz2$" { -# setenv.add-response-header = ("Content-Encoding" => "x-bzip2") -# mimetype.assign = (".bz2" => "text/plain") -# } -# -# }}} - -# {{{ debug -# debug.log-request-header = "enable" -# debug.log-response-header = "enable" -# debug.log-request-handling = "enable" -# debug.log-file-not-found = "enable" -# }}} - -# vim: set ft=conf foldmethod=marker et : -server.network-backend = "writev" diff --git a/apps/web/rompr/etc_lighthttpd/mime-types.conf b/apps/web/rompr/etc_lighthttpd/mime-types.conf deleted file mode 100644 index f24d4d8..0000000 --- a/apps/web/rompr/etc_lighthttpd/mime-types.conf +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# Default mime-types.conf for Gentoo. -# include'd from lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $ -############################################################################### - -# {{{ mime types -mimetype.assign = ( - ".svg" => "image/svg+xml", - ".svgz" => "image/svg+xml", - ".pdf" => "application/pdf", - ".sig" => "application/pgp-signature", - ".spl" => "application/futuresplash", - ".class" => "application/octet-stream", - ".ps" => "application/postscript", - ".torrent" => "application/x-bittorrent", - ".dvi" => "application/x-dvi", - ".gz" => "application/x-gzip", - ".pac" => "application/x-ns-proxy-autoconfig", - ".swf" => "application/x-shockwave-flash", - ".tar.gz" => "application/x-tgz", - ".tgz" => "application/x-tgz", - ".tar" => "application/x-tar", - ".zip" => "application/zip", - ".dmg" => "application/x-apple-diskimage", - ".mp3" => "audio/mpeg", - ".m3u" => "audio/x-mpegurl", - ".wma" => "audio/x-ms-wma", - ".wax" => "audio/x-ms-wax", - ".ogg" => "application/ogg", - ".wav" => "audio/x-wav", - ".gif" => "image/gif", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".png" => "image/png", - ".xbm" => "image/x-xbitmap", - ".xpm" => "image/x-xpixmap", - ".xwd" => "image/x-xwindowdump", - ".css" => "text/css", - ".html" => "text/html", - ".htm" => "text/html", - ".js" => "text/javascript", - ".asc" => "text/plain", - ".c" => "text/plain", - ".h" => "text/plain", - ".cc" => "text/plain", - ".cpp" => "text/plain", - ".hh" => "text/plain", - ".hpp" => "text/plain", - ".conf" => "text/plain", - ".log" => "text/plain", - ".text" => "text/plain", - ".txt" => "text/plain", - ".diff" => "text/plain", - ".patch" => "text/plain", - ".ebuild" => "text/plain", - ".eclass" => "text/plain", - ".rtf" => "application/rtf", - ".bmp" => "image/bmp", - ".tif" => "image/tiff", - ".tiff" => "image/tiff", - ".ico" => "image/x-icon", - ".dtd" => "text/xml", - ".xml" => "text/xml", - ".mpeg" => "video/mpeg", - ".mpg" => "video/mpeg", - ".mov" => "video/quicktime", - ".qt" => "video/quicktime", - ".avi" => "video/x-msvideo", - ".asf" => "video/x-ms-asf", - ".asx" => "video/x-ms-asf", - ".wmv" => "video/x-ms-wmv", - ".bz2" => "application/x-bzip", - ".tbz" => "application/x-bzip-compressed-tar", - ".tar.bz2" => "application/x-bzip-compressed-tar" - ) -# }}} - -# vim: set ft=conf foldmethod=marker et : diff --git a/apps/web/rompr/etc_lighthttpd/mod_cgi.conf b/apps/web/rompr/etc_lighthttpd/mod_cgi.conf deleted file mode 100644 index 1cb3770..0000000 --- a/apps/web/rompr/etc_lighthttpd/mod_cgi.conf +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################### -# mod_cgi.conf -# include'd by lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_cgi.conf,v 1.1 2005/08/27 12:36:13 ka0ttic Exp $ -############################################################################### - -# -# see cgi.txt for more information on using mod_cgi -# - -server.modules += ("mod_cgi") - -# NOTE: this requires mod_alias -alias.url = ( - "/cgi-bin/" => var.basedir + "/cgi-bin/" -) - -# -# Note that you'll also want to enable the -# cgi-bin alias via mod_alias (above). -# - -$HTTP["url"] =~ "^/cgi-bin/" { - # disable directory listings - dir-listing.activate = "disable" - # only allow cgi's in this directory - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "/usr/bin/perl" - ) -} - -# vim: set ft=conf foldmethod=marker et : diff --git a/apps/web/rompr/etc_lighthttpd/mod_fastcgi.conf b/apps/web/rompr/etc_lighthttpd/mod_fastcgi.conf deleted file mode 100644 index 549b84c..0000000 --- a/apps/web/rompr/etc_lighthttpd/mod_fastcgi.conf +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################### -# mod_fastcgi.conf -# include'd by lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2,v 1.1 2007/04/01 23:22:00 robbat2 Exp $ -############################################################################### - -server.modules += ("mod_fastcgi") -fastcgi.server = ( ".php" => - ( "localhost" => - ( - "socket" => "/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket", - "bin-path" => "/usr/bin/php-cgi" - ) - ) - ) - -# vim: set ft=conf foldmethod=marker et : diff --git a/apps/web/rompr/etc_lighthttpd/mod_fastcgi_fpm.conf b/apps/web/rompr/etc_lighthttpd/mod_fastcgi_fpm.conf deleted file mode 100644 index 4290301..0000000 --- a/apps/web/rompr/etc_lighthttpd/mod_fastcgi_fpm.conf +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################### -# mod_fastcgi_fpm.conf -# include'd by lighttpd.conf. -############################################################################### - -server.modules += ("mod_fastcgi") -fastcgi.server = ( ".php" => - ( - ( - "host" => "127.0.0.1", - "port" => "9000" - ) - ) - ) - -# vim: set ft=conf foldmethod=marker et : diff --git a/apps/web/rompr/etc_lighthttpd/rompr.conf b/apps/web/rompr/etc_lighthttpd/rompr.conf deleted file mode 100644 index 27dd7d9..0000000 --- a/apps/web/rompr/etc_lighthttpd/rompr.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Expire header for RompR albumart -expire.url = ( "/albumart/" => "modification plus 1 seconds" ) -# This sets the 404 page globally for the server which is OK if you're only -# running RompR but will affect other sites on your system. -# If you have other sites on this system then you should maybe look at virtual hosts. -# If you don't use the custom 404 page for RompR your album art manager will -# not work correctly. -server.error-handler-404 = "404.php" - -index-file.names = ( "index.php", "index.html", "index.lighttpd.html" ) -url.access-deny = ( "~", ".inc" ) -#static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) - -compress.cache-dir = "/var/cache/lighttpd/compress/" -compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )