Skip to content

Commit

Permalink
Merging in chroot changes
Browse files Browse the repository at this point in the history
  • Loading branch information
couling committed Dec 21, 2018
2 parents d9ab479 + f118cc1 commit e9c1717
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package-control/dpkg.control.rpi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: couling-webdavd
Section: devel
Priority: optional
Architecture: armhf
Depends: libc6, libmicrohttpd12, libpam0g, libxml2, libgnutls-deb0-28, libuuid1
Depends: libc6, libmicrohttpd12, libpam0g, libxml2, libgnutls30, libuuid1
Suggests:
Conflicts:
Replaces:
Expand Down
1 change: 1 addition & 0 deletions package-control/dpkg.postinst
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh

systemctl daemon-reload || true
service webdavd start || true
12 changes: 4 additions & 8 deletions package-with/conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,14 @@
can be specified. -->
<chroot-path>~</chroot-path>

<!-- Not yet supported until multiple servers is implemeted (see <server>
above). Planned to setup a lockdown on the main session -->
<restricted>nobody</restricted>

<!-- mime.types file default /etc/mime.types -->
<mime-file>/etc/mime.types</mime-file>

<!-- The location of the rap binary. DO NOT CHANGE UNLESS YOU KNOW WHAT
YOU ARE DOING! This is primarily here for testing but on non-standard systems
where binaries can not be stored in /usr/lib/webdav this will need to be changed to
the location of "webdav-rap" -->
<rap-binary>/usr/lib/webdav/webdav-worker</rap-binary>
<!-- <rap-binary>/usr/lib/webdavd/webdav-worker</rap-binary> -->

<!-- If a RAP hangs the thread waiting on it will wait this long before
giving up -->
Expand All @@ -89,7 +85,7 @@
<!-- Directory containing static error responses default /usr/share/webdavd.
Again this should only be changed on non-standard sytems or for testing when
the files can not be placed in /usr/share/webdavd -->
<static-response-dir>/usr/share/webdav</static-response-dir>
<!-- <static-response-dir>/usr/share/webdavd</static-response-dir> -->

<!-- The maximum amount of time before a lock expires automatically -->
<max-lock-time>2:00</max-lock-time>
Expand All @@ -109,7 +105,7 @@
<ssl-cert>

<!-- The PEM encoded certificate file -->
<certificate>/etc/ssl/certs/local/server.crt</certificate>
<certificate>/etc/ssl/certs/ssl-cert-snakeoil.pem</certificate>

<!-- If the certificate requires intermediary ca certificates then add
as many <chain> nodes as required. These must be added in order starting
Expand All @@ -118,7 +114,7 @@
<!-- <chain>/etc/ssl/certs/local/chain_server.crt</chain> -->

<!-- The key for <certificate> -->
<key>/etc/ssl/private/server.key</key>
<key>/etc/ssl/private/ssl-cert-snakeoil.key</key>
</ssl-cert>

<!-- As required.... -->
Expand Down

0 comments on commit e9c1717

Please sign in to comment.