From d5a58fa62bcd83b73d688b10fb5d0061ba2dd580 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sat, 9 Mar 2019 14:20:35 +0100 Subject: [PATCH] update --- composer.json | 3 +- composer.lock | 75 +++++++++++++++++++++++++++++++++++++++-------- config/app.ini | 4 +-- etc/apache2.conf | 5 ++++ etc/fpm-pool.conf | 43 +++++++++++++++++++++++++++ public/index.css | 3 ++ 6 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 etc/fpm-pool.conf diff --git a/composer.json b/composer.json index a02fb47..eeb6728 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ "m6w6/pharext.wiki": "dev-master", "m6w6/pq-gateway": "~2.1", "monolog/monolog": "^1.13", - "react/promise": "^2.2" + "react/promise": "^2.2", + "seebz/uri-template": "^1.1" } } diff --git a/composer.lock b/composer.lock index 88c2fb4..75de064 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "hash": "4c205773e5fd669075b88ad8b8707029", + "content-hash": "c926d96f919fd6be117001853d061d17", "packages": [ { "name": "league/plates", @@ -56,7 +56,7 @@ "templating", "views" ], - "time": "2015-07-09 02:14:40" + "time": "2015-07-09T02:14:40+00:00" }, { "name": "m6w6/merry", @@ -96,7 +96,7 @@ "container", "merry" ], - "time": "2015-03-12 13:49:46" + "time": "2015-03-12T13:49:46+00:00" }, { "name": "m6w6/pharext", @@ -136,7 +136,7 @@ "package", "phar" ], - "time": "2015-09-03 15:12:31" + "time": "2015-09-03T15:12:31+00:00" }, { "name": "m6w6/pharext.wiki", @@ -147,7 +147,7 @@ "reference": "master" }, "type": "library", - "time": "2015-04-30 17:39:40" + "time": "2015-05-20T06:40:18+00:00" }, { "name": "m6w6/pq-gateway", @@ -193,7 +193,7 @@ "postgresql", "pq" ], - "time": "2015-05-20 16:16:55" + "time": "2015-05-20T16:16:55+00:00" }, { "name": "monolog/monolog", @@ -269,7 +269,7 @@ "logging", "psr-3" ], - "time": "2015-08-31 09:17:37" + "time": "2015-08-31T09:17:37+00:00" }, { "name": "nikic/fast-route", @@ -312,7 +312,7 @@ "router", "routing" ], - "time": "2015-02-26 15:33:07" + "time": "2015-02-26T15:33:07+00:00" }, { "name": "psr/log", @@ -350,7 +350,7 @@ "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2012-12-21T11:40:51+00:00" }, { "name": "rdlowrey/auryn", @@ -411,7 +411,7 @@ "dic", "ioc" ], - "time": "2015-08-26 16:31:48" + "time": "2015-08-26T16:31:48+00:00" }, { "name": "react/promise", @@ -455,7 +455,58 @@ } ], "description": "A lightweight implementation of CommonJS Promises/A for PHP", - "time": "2015-07-03 13:48:55" + "time": "2015-07-03T13:48:55+00:00" + }, + { + "name": "seebz/uri-template", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/Seebz/uri-template.git", + "reference": "f2d7076e9c729a9dcb338ffe5de8e0df73034f38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seebz/uri-template/zipball/f2d7076e9c729a9dcb338ffe5de8e0df73034f38", + "reference": "f2d7076e9c729a9dcb338ffe5de8e0df73034f38", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "php": ">=5.6.0", + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "WTFPL" + ], + "authors": [ + { + "name": "Sébastien Corne", + "email": "sebastien@seebz.net", + "homepage": "http://seebz.net" + } + ], + "description": "Implementation of RFC 6570 (URI Template) in a single PHP function", + "homepage": "https://github.com/Seebz/uri-template", + "keywords": [ + "URI Template", + "rfc6570" + ], + "time": "2018-02-22T13:25:48+00:00" } ], "packages-dev": [], diff --git a/config/app.ini b/config/app.ini index 24178f7..5c88671 100644 --- a/config/app.ini +++ b/config/app.ini @@ -33,7 +33,7 @@ session.cache_limiter = "" session.cache_expire = 0 pq.flags = 0 -pq.dsn = "user=pharext host=localhost" +pq.dsn = "user=pharext" log.github.streamhandler.handler = StreamHandler log.github.streamhandler.args[] = ../logs/github.log @@ -46,4 +46,4 @@ github.hook.url = https://pharext.ngrok.io/src/pharext.org.git/public/github/hoo github.hook.insecure_ssl = 1 github.hook.use_basic_auth = ngrok -ngrok.command = ngrok \ No newline at end of file +ngrok.command = ngrok diff --git a/etc/apache2.conf b/etc/apache2.conf index 5f9c3e2..db864b7 100644 --- a/etc/apache2.conf +++ b/etc/apache2.conf @@ -10,9 +10,14 @@ AllowOverride All Require all granted SetEnv APP_ENVIRONMENT production + RemoveHandler .phar + SetHandler default-handler ForceType application/phar + + SetHandler "proxy:unix:/run/php/php-pharext.sock|fcgi://localhost" + diff --git a/etc/fpm-pool.conf b/etc/fpm-pool.conf new file mode 100644 index 0000000..2cb60e1 --- /dev/null +++ b/etc/fpm-pool.conf @@ -0,0 +1,43 @@ +; Start a new pool named 'www'. +; the variable $pool can be used in any directive and will be replaced by the +; pool name ('www' here) +[pharext] + +user = www-data +group = www-data + +listen = /run/php/php-$pool.sock +listen.owner = www-data +listen.group = www-data +;listen.mode = 0660 + +pm = dynamic +pm.max_children = 20 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +;pm.max_requests = 500 + +slowlog = /var/log/php-fpm.log.slow +request_slowlog_timeout = 30 + +; Depth of slow log stack trace. +; Default Value: 20 +;request_slowlog_trace_depth = 20 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +chdir = /var/www/$pool + +; Note: set an empty value to allow all extensions. +; Default Value: .php +security.limit_extensions = .php + diff --git a/public/index.css b/public/index.css index 8253ebd..57172df 100644 --- a/public/index.css +++ b/public/index.css @@ -1,3 +1,6 @@ +html .label { + padding-top: 0.6em; +} .footer { position: fixed; bottom: 0px; -- 2.30.2