php replaced with haserl (no need to run php for several lines of code)

1 files changed, 16 insertions, 54 deletions

diff --git a/setup b/setup
index a061a68..0ea23b9 100644
--- a/setup
+++ b/setup
@@ -1,60 +1,22 @@
 #!/bin/sh
 
-apk add nginx php-fpm php-sqlite3 sqlite3 lua lua-cjson lua-sqlite
-
+apk add mqtt-exec sqlite lighttpd haserl lua lua-cjson lua-sqlite lua5.3 lua5.3-sql-sqlite3
+	# mini_httpd can be used instead of lighttpd
 adduser -H -D www
-chown www:www -R /usr/share/build-errors
-chown -R www:www /var/spool/build-errors/sqlite
-chmod +x /usr/share/build-errors/*.sh
-chmod +x /usr/share/build-errors/*.lua
-
+chown lighttpd:lighttpd -R /var/lib/build-errors
+chmod +x /var/lib/build-errors/*.lua
 ln -s mqtt-exec /etc/init.d/mqtt-exec.build-errors
 
-vi /etc/nginx/nginx.conf
-#user www www;
-#worker_processes  2;
-#pid /var/run/nginx/nginx.pid;
-#error_log  /var/log/nginx/error.log  info;
-#events {
-#    worker_connections  1024;
-#}
-#http {
-#    include       mime.types;
-#    default_type  application/octet-stream;
-#    sendfile        on;
-#    keepalive_timeout  300;
-#    server {
-#        listen                  81;
-#        root                    /usr/share/build-errors/www;
-#        server_name             localhost;
-#        client_max_body_size    32m;
-#        index                   index.html index.htm index.php;
-#        error_page              500 502 503 504  /50x.html;
-#        location = /50x.html {
-#            root                /usr/share/nginx/html;
-#        }
-#        location ~ \.php$ {
-#                 try_files      $uri =404;
-#                 fastcgi_pass   unix:/run/php-fpm/php-fpm.sock;
-#                 fastcgi_index  index.php;
-#                 include        fastcgi.conf;
-#        }
-#    }
-#}
+# testings
+vi /etc/conf.d/mqtt-exec.build-errors
+	# mqtt_broker="broker.hivemq.com"
+echo 'build/build-edge-armhf/errors {"hostname":"build-edge-armhf","pkgname":"package1","reponame":"repo1","logurl":"http:\/\/build.alpinelinux.org\/buildlogs\/build-edge-armhf\/main\/package1\/package1-5.5.1-r0.log"}' | /bin/sh /var/lib/build-errors/scripts/save-build-error.sh
+mosquitto_pub -h broker.hivemq.com -t 'build/build-edge-armhf/errors' -m '{"hostname":"build-edge-armhf","pkgname":"package1","reponame":"repo1","logurl":"http:\/\/build.alpinelinux.org\/buildlogs\/build-edge-armhf\/main\/package1\/package1-5.5.1-r0.log"}'
+	# if worked:
+	#  sqlite3 /var/lib/build-errors/sqlite/build-errors.db "delete from build_errors where id = xxxx"
+	#   (id nr can be found in webpage source in that row <!-- id: xxxx -->)
+# testing cron-job script:
+sqlite3 /var/lib/build-errors/sqlite/build-errors.db "insert into build_errors(hostname,pkgname,reponame,logurl,comment,datetime) values ('test1','test1','test1','#','test1','2001-01-01')"
+sqlite3 /var/lib/build-errors/sqlite/build-errors.db "insert into build_errors(hostname,pkgname,reponame,logurl,comment,datetime) values ('test2','test2','test2','#','test2','2002-02-02')"
+sudo --user=lighttpd sh /etc/periodic/weekly/clear-old-build-errors.sh
 
-vi /etc/php/php-fpm.conf
-#[global]
-#error_log = /var/log/php-fpm.log
-#
-#[www]
-#user = www 
-#group = www
-#listen = /run/php-fpm/php-fpm.sock
-#listen.owner = www
-#listen.group = www
-#listen.mode = 0660
-#pm = dynamic
-#pm.max_children = 5
-#pm.start_servers = 2
-#pm.min_spare_servers = 1
-#pm.max_spare_servers = 3