diff --git a/MANTAINERS.md b/MANTAINERS.md new file mode 100644 --- /dev/null +++ b/MANTAINERS.md @@ -0,0 +1,8 @@ +This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository. + +- Evan Maddock + - IRC: EbonJaeger + - Email: maddock.evan@vivaldi.net +- Martin Reboredo + - IRC: YakoYako + - Email: yakoyoku@gmail.com diff --git a/Makefile b/Makefile new file mode 100644 --- /dev/null +++ b/Makefile @@ -0,0 +1 @@ +include ../Makefile.common diff --git a/abi_used_libs b/abi_used_libs new file mode 100644 --- /dev/null +++ b/abi_used_libs @@ -0,0 +1,2 @@ +libc.so.6 +libpthread.so.0 diff --git a/abi_used_symbols b/abi_used_symbols new file mode 100644 --- /dev/null +++ b/abi_used_symbols @@ -0,0 +1,52 @@ +libc.so.6:__assert_fail +libc.so.6:__libc_start_main +libc.so.6:__stack_chk_fail +libc.so.6:abort +libc.so.6:calloc +libc.so.6:clock +libc.so.6:fflush +libc.so.6:fprintf +libc.so.6:fputc +libc.so.6:free +libc.so.6:freeaddrinfo +libc.so.6:fwrite +libc.so.6:gai_strerror +libc.so.6:getaddrinfo +libc.so.6:getgrgid_r +libc.so.6:getgrnam_r +libc.so.6:getgrouplist +libc.so.6:getnameinfo +libc.so.6:getpwnam_r +libc.so.6:getpwuid_r +libc.so.6:malloc +libc.so.6:memcmp +libc.so.6:memcpy +libc.so.6:memmove +libc.so.6:memset +libc.so.6:mmap +libc.so.6:munmap +libc.so.6:nanosleep +libc.so.6:pthread_attr_destroy +libc.so.6:pthread_attr_init +libc.so.6:qsort +libc.so.6:realloc +libc.so.6:setenv +libc.so.6:sigaddset +libc.so.6:sigemptyset +libc.so.6:sigfillset +libc.so.6:sigismember +libc.so.6:stderr +libc.so.6:strerror +libc.so.6:sysconf +libc.so.6:unsetenv +libc.so.6:vfprintf +libpthread.so.0:__errno_location +libpthread.so.0:pthread_attr_getstacksize +libpthread.so.0:pthread_cond_broadcast +libpthread.so.0:pthread_cond_wait +libpthread.so.0:pthread_create +libpthread.so.0:pthread_detach +libpthread.so.0:pthread_mutex_lock +libpthread.so.0:pthread_mutex_unlock +libpthread.so.0:pthread_sigmask +libpthread.so.0:sigaction diff --git a/files/Caddyfile b/files/Caddyfile new file mode 100644 --- /dev/null +++ b/files/Caddyfile @@ -0,0 +1,25 @@ +# The Caddyfile is an easy way to configure your Caddy web server. +# +# Unless the file starts with a global options block, the first +# uncommented line is always the address of your site. +# +# To use your own domain name (with automatic HTTPS), first make +# sure your domain's A/AAAA DNS records are properly pointed to +# this machine's public IP, then replace the line below with your +# domain name. +:80 + +# Set this path to your site's directory. +root * /usr/share/caddy + +# Enable the static file server. +file_server + +# Another common task is to set up a reverse proxy: +# reverse_proxy localhost:8080 + +# Or serve a PHP site through php-fpm: +# php_fastcgi localhost:9000 + +# Refer to the Caddy docs for more information: +# https://caddyserver.com/docs/caddyfile diff --git a/files/caddy.service b/files/caddy.service new file mode 100644 --- /dev/null +++ b/files/caddy.service @@ -0,0 +1,32 @@ +[Unit] +Description=Caddy Web Server +Documentation=https://caddyserver.com/docs/ +After=network.target + +[Service] +User=caddy +Group=caddy +ExecStart=/usr/bin/caddy run --config /usr/share/caddy/Caddyfile --resume --environ +ExecReload=/usr/bin/caddy reload --config /usr/share/caddy/Caddyfile +ExecStop=/usr/bin/caddy stop +TimeoutStopSec=5s +LimitNOFILE=1048576 +LimitNPROC=512 + +# Hardening options +PrivateTmp=true +ProtectSystem=strict +PrivateDevices=true +ProtectHome=true +ReadWritePaths=/var/lib/caddy /var/log/caddy +AmbientCapabilities=CAP_NET_BIND_SERVICE +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +NoNewPrivileges=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectControlGroups=true +LockPersonality=true + + +[Install] +WantedBy=multi-user.target diff --git a/files/caddy.sysusers b/files/caddy.sysusers new file mode 100644 --- /dev/null +++ b/files/caddy.sysusers @@ -0,0 +1,2 @@ +g caddy - - +u caddy - "Caddy web server" /var/lib/caddy diff --git a/files/caddy.tmpfiles b/files/caddy.tmpfiles new file mode 100644 --- /dev/null +++ b/files/caddy.tmpfiles @@ -0,0 +1,2 @@ +d /var/lib/caddy 0700 caddy caddy +d /var/log/caddy 0700 caddy caddy diff --git a/files/tweaked-welcome-site.patch b/files/tweaked-welcome-site.patch new file mode 100644 --- /dev/null +++ b/files/tweaked-welcome-site.patch @@ -0,0 +1,21 @@ +--- a/dist/welcome/index.html ++++ b/dist/welcome/index.html +@@ -189,7 +189,7 @@ +

+ Congratulations! + おめでとう! +- Felicidades! ++ Felicitaciones! + 恭喜! + बधाई हो! + Поздравляю!
 +@@ -200,6 +200,9 @@ + Your web server is working. Now make it work for you. 💪 +

+

++ You can also check out the Solus Help Center article. ++

++

+ Caddy is ready to serve your site over HTTPS: +

+
    diff --git a/package.yml b/package.yml new file mode 100644 --- /dev/null +++ b/package.yml @@ -0,0 +1,30 @@ +name : caddy +version : 2.3.0 +release : 1 +source : + - https://github.com/caddyserver/caddy/archive/v2.3.0.tar.gz : 4688b122ac05be39622aa81324d1635f1642e4a66d731e82d210aef78cf2766a + - git|https://github.com/caddyserver/dist : 8503149e68db298dbe87253e9fbc9792cbe318f8 + - https://raw.githubusercontent.com/caddyserver/website/4827cff65967435cd3db6b90bc5da6355e868f6a/src/docs/markdown/command-line.md : 09bddfb34256cb1c254f3d232841d2bf6541e004ea7790cdd04b2c397c454f67 +license : Apache-2.0 +component : programming +summary : Fast, multi-platform web server with automatic HTTPS +description: | + Caddy is a powerful, open source web server with automatic HTTPS written in Go +networking : yes +builddeps : + - golang +setup : | + cp -r $sources/dist* dist +build : | + go build -o caddy cmd/caddy/main.go +install : | + install -Dm00755 caddy $installdir/usr/bin/caddy + + install -Dm00644 $pkgfiles/caddy.sysusers $installdir/%libdir%/sysusers.d/caddy.conf + install -Dm00644 $pkgfiles/caddy.tmpfiles $installdir/%libdir%/tmpfiles.d/caddy.conf + install -Dm00644 $pkgfiles/caddy.service dist/init/caddy-api.service -t $installdir/%libdir%/systemd/system + install -Dm00644 $pkgfiles/Caddyfile $installdir/usr/share/caddy/Caddyfile + + install -Dm00644 dist/welcome/index.html $installdir/usr/share/caddy/index.html + install -Dm00644 dist/scripts/completions/bash-completion $installdir/usr/share/bash-completion/completions/caddy + install -Dm00644 dist/scripts/completions/_caddy $installdir/usr/share/zsh/site-functions/_caddy diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml new file mode 100644 --- /dev/null +++ b/pspec_x86_64.xml @@ -0,0 +1,42 @@ + + + caddy + + Martin Reboredo + yakoyoku@gmail.com + + Apache-2.0 + programming + Fast, multi-platform web server with automatic HTTPS + Caddy is a powerful, open source web server with automatic HTTPS written in Go + + https://getsol.us/sources/README.Solus + + + caddy + Fast, multi-platform web server with automatic HTTPS + Caddy is a powerful, open source web server with automatic HTTPS written in Go + + programming + + /usr/bin/caddy + /usr/lib64/systemd/system/caddy-api.service + /usr/lib64/systemd/system/caddy.service + /usr/lib64/sysusers.d/caddy.conf + /usr/lib64/tmpfiles.d/caddy.conf + /usr/share/bash-completion/completions/caddy + /usr/share/caddy/Caddyfile + /usr/share/caddy/index.html + /usr/share/zsh/site-functions/_caddy + + + + + 2021-02-05 + 2.3.0 + Packaging update + Martin Reboredo + yakoyoku@gmail.com + + + \ No newline at end of file