diff options
-rw-r--r-- | .SRCINFO | 29 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | mini_httpd.install | 16 | ||||
-rw-r--r-- | mini_httpd.pem | 49 |
4 files changed, 35 insertions, 70 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Wed Jan 6 17:48:03 UTC 2016 pkgbase = mini_httpd pkgdesc = A small and simple forking http server. CGI, SSL, auth, vhosts, ipv6. - pkgver = 1.22 + pkgver = 1.23 pkgrel = 1 url = http://www.acme.com/software/mini_httpd/ install = mini_httpd.install @@ -8,27 +10,26 @@ pkgbase = mini_httpd arch = x86_64 license = custom depends = openssl - backup = etc/mini_httpd.conf - source = http://www.acme.com/software/mini_httpd/mini_httpd-1.22.tar.gz + backup = etc/mini_httpd/mini_httpd.conf + backup = etc/mini_httpd/mini_httpd_ssl.conf + source = http://www.acme.com/software/mini_httpd/mini_httpd-1.23.tar.gz source = mini_httpd.service source = mini_httpd_ssl.service source = mini_httpd.logrotate source = mini_httpd.conf source = mini_httpd_ssl.conf - source = mini_httpd.pem source = sample.cgi source = sample_perl.cgi source = LICENSE - md5sums = fc93510610943c97532bce4b298a1b45 - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP + sha1sums = 0701ca607f8b8a0c8e0409084d0ac8720beb87f2 + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP pkgname = mini_httpd @@ -1,32 +1,32 @@ # Maintainer: mrxx <mrxx at cyberhome dot at> # Contributor: bender02 at gmx dot com + pkgname=mini_httpd -pkgver=1.22 +pkgver=1.23 pkgrel=1 pkgdesc="A small and simple forking http server. CGI, SSL, auth, vhosts, ipv6." url="http://www.acme.com/software/mini_httpd/" arch=('i686' 'x86_64') license=('custom') depends=('openssl') -backup=('etc/mini_httpd.conf') +backup=('etc/mini_httpd/mini_httpd.conf' + 'etc/mini_httpd/mini_httpd_ssl.conf') source=("http://www.acme.com/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'mini_httpd.service' 'mini_httpd_ssl.service' 'mini_httpd.logrotate' 'mini_httpd.conf' 'mini_httpd_ssl.conf' - 'mini_httpd.pem' 'sample.cgi' 'sample_perl.cgi' 'LICENSE') -md5sums=('fc93510610943c97532bce4b298a1b45' +sha1sums=('0701ca607f8b8a0c8e0409084d0ac8720beb87f2' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' 'SKIP' 'SKIP' 'SKIP') @@ -54,7 +54,6 @@ package() { cd "$pkgname-$pkgver" install -Dm644 -t "${pkgdir}/etc/${pkgname}/" "${srcdir}/${pkgname}.conf" "${srcdir}/${pkgname}_ssl.conf" install -Dm644 -t "${pkgdir}/usr/lib/systemd/system/" "${srcdir}/${pkgname}.service" "${srcdir}/${pkgname}_ssl.service" - install -Dm640 -t "${pkgdir}/etc/ssl/private/" "${srcdir}/${pkgname}.pem" install -Dm755 -t "${pkgdir}/srv/http/" "${srcdir}/sample.cgi" "${srcdir}/sample_perl.cgi" install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}" install -D "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" diff --git a/mini_httpd.install b/mini_httpd.install index 69b5db2b1d31..74fcf6ad23a7 100644 --- a/mini_httpd.install +++ b/mini_httpd.install @@ -1,12 +1,26 @@ post_install() { [ ! -f /srv/http/index.html ] && echo "<html><body><h2>Server online.</h2></body></html>" >/srv/http/index.html - [ ! -f /srv/http/index.php ] && echo "<?php phpinfo(); ?>" >/srv/http/index.php + if [ ! -f /etc/ssl/private/mini_httpd.pem ]; then + echo + openssl req -x509 -nodes -newkey rsa:2048 -sha256 -keyout /etc/ssl/private/mini_httpd.pem -out /etc/ssl/private/mini_httpd.pem -days 3650 -subj "/C=US/ST=California/L=Berkeley/O=ACME Laboratories/CN=$(hostname -f)" + chmod 600 /etc/ssl/private/mini_httpd.pem + echo + echo "A self-signed TLS certificate has been generated for your machine '$(hostname -f)'." + echo + echo "You can generate a new one with the following commands (as root):" + echo "openssl req -x509 -nodes -newkey rsa:2048 -sha256 -keyout /etc/ssl/private/mini_httpd.pem -out /etc/ssl/private/mini_httpd.pem -days 365" + echo "chmod 600 /etc/ssl/private/mini_httpd.pem" + echo + echo "Note: The Common Name (CN) should be exactly the FQDN of the server." + echo "The validity can be extended by increasing the '-days' parameter value." + fi echo echo "*** USAGE ***" echo echo "'systemctl start mini_httpd.service' starts the web server." echo "'systemctl start mini_httpd_ssl.service' starts the web server in SSL mode." echo "Web server root is /srv/http." + echo "CGI samples are included." echo "Configuration files are in /etc/mini_httpd/ (man mini_httpd for options)" echo "For directory protection, use mini_htpasswd ." echo diff --git a/mini_httpd.pem b/mini_httpd.pem deleted file mode 100644 index 0fb960b02e25..000000000000 --- a/mini_httpd.pem +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYwC3Iy3LFuES+ -ki4MBwm41Vorivj/6gTmY2IGbdGuFAhKjvopzrGHU6G8teG545iAg4bomNJnQ2Wm -KP9ZAkYErCeQTtHh1DeTclnjP00oqyJ7pXOdef4szH0Et/nEZA+SXKQe+pLlAnnI -kQogpwnfk6WOI3px0HIelxTaZMxWCjeQ/nyaH73S/1wU5IBQTr2ddie3ds+E1NUs -WMwion4tWiaHrAaPSKo6HEO2+KKrc+an+HPMohZ7NDoYRap1WxDuVmvVeyuqGj71 -G8Etnfv12mkT0srTF99iCYjTQVMj6CCg7kJanrc7YZaRztFmaOcK03iTPxTAYIMX -+F+GyukXAgMBAAECggEAZ96/A3y9NhBAxuo2X71lcge6wkNFYRisblIEdWS2Ic7D -eJfTKxy/gctv/xgbP8GxkSpfUcmhwdCFzcCxKsCuBj1exfWjKRKbHCu1Th9cg5wj -3bq7bMlo+uOu28eTE2YLZLaUb/BqdUoCsE1Yeq27vAn1mTss5zoccArChmPmw1Yw -VAaNVdy/fCAAqGkBoEIYxbk7j1khDgyNxcbnXcetReSnR1fL01sO0dP0EM3hDLKt -KD2Rm1dluJxc1OMrHWGcsjhoSKJnNTw9FxaxvgYFcg4ulz5hnLGKt3wwNyK+he63 -QdB6vrcyaggZ+XzouG/YF5x/3c1XpQRRmRcZBDAqYQKBgQDGQir2w2ZtWktjjDEs -NT3jtk7WZHZIpyTp22mNVa6Ep01QM7G92/TAXtwfhTtPk0SV0JqSPS3YvA2yEHpB -4bEWCUCwrlXujXj80KjlnilpazxaAwW04C5/5OLVF48aUKHJNwVsV2yJy1nRbKXi -ViVz86qABODH6O1SENN2a/MR0QKBgQDFPQZmJ+o+SQ/O34MXqsxq8d3s5CdfvtYO -syp8luFs+L/WimTkx/26numYuhnSceWgkYt+Hoe/ts8jlQVl/Rk+RajR2sftYxsJ -xUDe5kWpKxWJ/mVqw8iU3ahvjQLzQyJrp2wZNaZJ5l+3lEZcfiI7eGvPaypVZhKV -h6eA6TReZwKBgCfmBwl0F3foVQWqn/a6nELoXINO4nMKmCYsDtjvplhx5uA+FwYT -bvUL4hbB1EbWZ1YTDhhiEYjth4APSttZVS8PG6Ky4v5IIFIYl/Tl2IWrnBCtTQey -mgkJAhFKVXVBRt3coc3E5kXw05mO2O9s0Mq9/dEXqjjxClmao0PQw7ERAoGAMR3B -Oi82ZcxL43hFbN9biEYyvYsTQwSCyaZULjJkcH6BRyuvdElZJd/sy9uMEpvKUvHr -iryPkW40pue1MHCWmKtAHwIcR0EmuogkX114e2f/NR3ko3GdwXRxPVYgJfPR3n0S -rjRt9Hkp3M1PuDiwzZ5vOne1Uw7YEeR2EeQA5oECgYEAsyLCTeNCSGURRPIQYYgv -VTrpBM3PlQDp4b/cnkWujGAsTnZbgtks4+VO0T7oQJul1d8F4LP/U1pPrWiREVKv -EaDt7sHTI/Y2zFV90NNxzEAWpcovyGaQcHSUk7HCu3bOZfBe5RIsADBGZWhACTQk -NrPBZBJEvO4F7fvlvbxS03E= ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIDdTCCAl2gAwIBAgIJALM9hNIIiKfOMA0GCSqGSIb3DQEBCwUAMFExCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhCZXJrZWxleTEa -MBgGA1UECgwRQUNNRSBMYWJvcmF0b3JpZXMwHhcNMTUwNzE0MDAzNDIwWhcNMzEw -NzEwMDAzNDIwWjBRMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTER -MA8GA1UEBwwIQmVya2VsZXkxGjAYBgNVBAoMEUFDTUUgTGFib3JhdG9yaWVzMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmMAtyMtyxbhEvpIuDAcJuNVa -K4r4/+oE5mNiBm3RrhQISo76Kc6xh1OhvLXhueOYgIOG6JjSZ0Nlpij/WQJGBKwn -kE7R4dQ3k3JZ4z9NKKsie6VznXn+LMx9BLf5xGQPklykHvqS5QJ5yJEKIKcJ35Ol -jiN6cdByHpcU2mTMVgo3kP58mh+90v9cFOSAUE69nXYnt3bPhNTVLFjMIqJ+LVom -h6wGj0iqOhxDtviiq3Pmp/hzzKIWezQ6GEWqdVsQ7lZr1Xsrqho+9RvBLZ379dpp -E9LK0xffYgmI00FTI+ggoO5CWp63O2GWkc7RZmjnCtN4kz8UwGCDF/hfhsrpFwID -AQABo1AwTjAdBgNVHQ4EFgQUwSlSt1brS9kzm7p1LpTh5iKiJOYwHwYDVR0jBBgw -FoAUwSlSt1brS9kzm7p1LpTh5iKiJOYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B -AQsFAAOCAQEAMLSFlpF1D0MkYiCvy+ZIKjtYKo50LOoglvTjJ4GwPBcVNtl2t3Cy -S1Vgax/6MadUbOipfXlvbIjN3Rh1dMo09VasoSM03ayMU8k3MFfhpu0ShOW0NLFX -dpCjG1UTG9BEVnGPlkjTx6GeEdgaaBgIafgS3cHNpLfPLQH1FIO12MUXFXR2wowV -//jwdtAp9ZExcNEXkfLWdEGavF+kRF5wjvmBu9e8jGe3WwLPHoyb8zxUq26eQrBZ -HDGIEVfovUH5EIYCcizkVl1jxL9E+WAj5R5cxyfXVMb8mo9iZws7K86Whq7/SIeL -OSDHlT6v4ozJkdgUONSpG0IjpGzQjAhWmg== ------END CERTIFICATE----- |