Update to baikal-0.4.6
from Remi Locherer
This commit is contained in:
jca
parent
1bdee0761b
commit
d2c37ff314
@ -1,36 +1,31 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2016/02/04 13:14:15 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2016/12/02 15:01:21 jca Exp $
|
||||
|
||||
COMMENT= lightweight CalDAV and CardDAV server
|
||||
|
||||
DISTNAME= baikal-regular-0.2.7
|
||||
PKGNAME= ${DISTNAME:S/-regular//}
|
||||
EXTRACT_SUFX= .tgz
|
||||
VERSION= 0.4.6
|
||||
DISTNAME= baikal-${VERSION}
|
||||
MASTER_SITES= https://github.com/fruux/Baikal/releases/download/${VERSION}/
|
||||
DISTFILES= ${DISTNAME}.zip
|
||||
CATEGORIES= productivity www
|
||||
REVISION= 2
|
||||
|
||||
HOMEPAGE= http://baikal-server.com/
|
||||
HOMEPAGE= http://sabre.io/baikal/
|
||||
|
||||
# GPLv3
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MASTER_SITES= http://baikal-server.com/get/
|
||||
|
||||
MODULES= lang/php
|
||||
|
||||
WRKDIST= ${WRKDIR}/baikal-regular/
|
||||
|
||||
NO_BUILD= Yes
|
||||
NO_TEST= Yes
|
||||
PKG_ARCH= *
|
||||
|
||||
PREFIX= ${VARBASE}/www
|
||||
PREFIX= ${VARBASE}/www
|
||||
INSTDIR= ${PREFIX}/baikal
|
||||
WRKSRC= ${WRKDIR}/baikal
|
||||
SUBST_VARS= INSTDIR
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${INSTDIR}
|
||||
cd ${WRKSRC} && tar cf - . | (cd ${INSTDIR}; tar xf -)
|
||||
find ${INSTDIR} -name '*.orig' -exec rm {} \;
|
||||
mv ${INSTDIR}/Specific/db/db.sqlite{,.dist}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (baikal-regular-0.2.7.tgz) = Jo2u7Ja58bv+4MFjmK4hOr/oJ8l+xIcXmYWCi2JnNZ8=
|
||||
SIZE (baikal-regular-0.2.7.tgz) = 2273699
|
||||
SHA256 (baikal-0.4.6.zip) = lG6OQWH374S+QkMLbp07t91Lu+JBtAm+IIwURH16p6Y=
|
||||
SIZE (baikal-0.4.6.zip) = 3288478
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
$OpenBSD: patch-Specific_virtualhosts_baikal_nginx,v 1.1 2013/09/13 15:27:58 ajacoutot Exp $
|
||||
--- Specific/virtualhosts/baikal.nginx.orig Fri Sep 13 15:10:51 2013
|
||||
+++ Specific/virtualhosts/baikal.nginx Fri Sep 13 15:12:06 2013
|
||||
@@ -2,11 +2,11 @@ server {
|
||||
listen 80;
|
||||
server_name dav.mydomain.com;
|
||||
|
||||
- root /var/www/dav.mydomain.com;
|
||||
+ root /var/www/baikal/html;
|
||||
index index.php;
|
||||
|
||||
- rewrite ^/.well-known/caldav /cal.php redirect;
|
||||
- rewrite ^/.well-known/carddav /card.php redirect;
|
||||
+ rewrite ^/.well-known/caldav /cal.php redirect;
|
||||
+ rewrite ^/.well-known/carddav /card.php redirect;
|
||||
|
||||
charset utf-8;
|
||||
|
||||
@@ -18,7 +18,7 @@ server {
|
||||
location ~ ^(.+\.php)(.*)$ {
|
||||
try_files $fastcgi_script_name =404;
|
||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||
- fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;
|
||||
+ fastcgi_pass 127.0.0.1:9000;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
@@ -26,6 +26,6 @@ server {
|
||||
|
||||
error_page 500 502 503 504 /50x.html;
|
||||
location = /50x.html {
|
||||
- root /var/www/nginx-default;
|
||||
+ root /var/www/htdocs;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
$OpenBSD: README,v 1.4 2013/09/20 07:11:02 ajacoutot Exp $
|
||||
$OpenBSD: README,v 1.5 2016/12/02 15:01:21 jca Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${FULLPKGNAME} on OpenBSD
|
||||
@ -10,10 +10,29 @@ Baikal has been installed into ${INSTDIR}.
|
||||
|
||||
You should point this to the DocumentRoot of your web-server:
|
||||
# ln -s ../baikal/html /var/www/htdocs/baikal
|
||||
(make sure you use a relative symlink since Apache is chrooted)
|
||||
(make sure you use a relative symlink if your server is chrooted)
|
||||
|
||||
Alternatively you can setup a virtual host using the configuration
|
||||
provided in ${INSTDIR}/Specific/virtualhosts/
|
||||
Alternatively the below configuration can be used for httpd from
|
||||
base together with php-fpm:
|
||||
|
||||
server "default" {
|
||||
listen on * port 80
|
||||
|
||||
location "/.well-known/ca*dav" {
|
||||
block return 301 "http://<hostname>/baikal/dav.php"
|
||||
}
|
||||
|
||||
location "/baikal/*.php*" {
|
||||
root { "/baikal/html", strip 1 }
|
||||
fastcgi socket "/run/php-fpm.sock"
|
||||
directory index index.php
|
||||
}
|
||||
|
||||
location "/baikal/*" {
|
||||
root { "/baikal/html", strip 1 }
|
||||
directory index index.php
|
||||
}
|
||||
}
|
||||
|
||||
Database Configuration
|
||||
======================
|
||||
@ -24,9 +43,11 @@ another database, the corresponding package needs to be installed:
|
||||
|
||||
Post-installation
|
||||
=================
|
||||
To finish the installation:
|
||||
# touch ${INSTDIR}/Specific/ENABLE_INSTALL
|
||||
-> go to http://<hostname>/baikal/ then follow the instructions
|
||||
To finish the installation go to http://<hostname>/baikal/ and follow
|
||||
the instructions.
|
||||
|
||||
To make the above httpd.conf work you need to go to "System settings"
|
||||
in the admin interface and set the 3 base URIs to "/baikal/XXX.php/".
|
||||
|
||||
Baikal administration
|
||||
=====================
|
||||
|
||||
Loading…
Reference in New Issue
Block a user