From 11857b8b10c5e8d83e970b6c85cebc61965bd85c Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Wed, 31 Dec 2014 17:46:31 +0100 Subject: [PATCH 1/9] [enh] new manifest specs --- manifest.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 570b750..aca2186 100644 --- a/manifest.json +++ b/manifest.json @@ -5,16 +5,17 @@ "en": "Lightweight CalDAV+CardDAV server", "fr": "Serveur CalDAV+CardDAV léger" }, - "developer": { + "url": "https://github.com/julienmalik", + "maintainer": { "name": "julien", - "email": "julien.malik@paraiso.me", - "url": "https://github.com/julienmalik" + "email": "julien.malik@paraiso.me" }, "multi_instance": "true", "arguments": { "install" : [ { "name": "domain", + "type": "domain", "ask": { "en": "Choose a domain for baikal" }, @@ -22,6 +23,7 @@ }, { "name": "path", + "type": "path", "ask": { "en": "Choose a path for baikal" }, @@ -30,6 +32,7 @@ }, { "name": "password", + "type": "password", "ask": { "en": "Choose a password for baikal admin" }, From 639e51d4bb06c40cd624335bb1bb8d1d40fdaaea Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Wed, 31 Dec 2014 17:47:20 +0100 Subject: [PATCH 2/9] [bug] fix url in manifest --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index aca2186..a8631db 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "en": "Lightweight CalDAV+CardDAV server", "fr": "Serveur CalDAV+CardDAV léger" }, - "url": "https://github.com/julienmalik", + "url": "http://baikal-server.com/", "maintainer": { "name": "julien", "email": "julien.malik@paraiso.me" From 00bec35ca8f9e0c37093cb3ac7b232ed1c505e1b Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Mon, 19 Jan 2015 08:20:43 +0100 Subject: [PATCH 3/9] Update nginx.conf --- conf/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1d18915..b9ac416 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,9 +9,9 @@ location PATHTOCHANGE { location ~ ^(.+\.php)(.*)$ { fastcgi_split_path_info ^(.+\.php)(.*)$; fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; include fastcgi_params; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; } #rewrite ~ ^/.well-known/caldav PATHTOCHANGE/cal.php redirect; #rewrite ~ ^/.well-known/carddav PATHTOCHANGE/card.php redirect; @@ -19,4 +19,4 @@ location PATHTOCHANGE { location ~ ^PATHTOCHANGE/(\.ht|Core|Specific) { deny all; -} \ No newline at end of file +} From 5553f0fd6dde72464622518d7667ec5726d97439 Mon Sep 17 00:00:00 2001 From: julienmalik Date: Wed, 29 Jul 2015 15:23:12 +0200 Subject: [PATCH 4/9] Work around missing shell for www-data in jessie See #10 --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 3afad23..1f50dc3 100644 --- a/scripts/install +++ b/scripts/install @@ -21,8 +21,8 @@ final_path=/var/www/baikal sudo mkdir -p $final_path sudo cp -a ../sources/* $final_path sudo chown -R www-data: $final_path -sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" www-data -sudo su -c "cd $final_path && php composer.phar install" www-data +sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" -s /bin/sh www-data +sudo su -c "cd $final_path && php composer.phar install" -s /bin/sh www-data sudo rm $final_path/composer* db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From c2386b95552fec30ac06a446ac7a67d61a290b51 Mon Sep 17 00:00:00 2001 From: julienmalik Date: Wed, 29 Jul 2015 15:25:17 +0200 Subject: [PATCH 5/9] Work around missing shell for www-data in jessie --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 87af46c..61443f9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,8 +18,8 @@ sudo rm -rf /var/www/baikal sudo mkdir -p $final_path sudo cp -a ../sources/* $final_path sudo chown -R www-data: $final_path -sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" www-data -sudo su -c "cd $final_path && php composer.phar install" www-data +sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" -s /bin/sh www-data +sudo su -c "cd $final_path && php composer.phar install" -s /bin/sh www-data sudo rm $final_path/composer* db_pwd=$(sudo yunohost app setting baikal mysqlpwd) From 86ab487397d27848c637ac3a1950dfc76271eb74 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Mon, 3 Aug 2015 10:33:03 +0200 Subject: [PATCH 6/9] Fix installation on subdomain --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index b9ac416..8ae597e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ location PATHTOCHANGE { - alias ALIASTOCHANGE; + alias ALIASTOCHANGE/; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } From fe0a0cabb7a63e8a7d09439c1795ce2346171ec8 Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 22 Nov 2015 16:07:14 +0100 Subject: [PATCH 7/9] [enh] Add services list in manifest --- manifest.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifest.json b/manifest.json index a8631db..767d370 100644 --- a/manifest.json +++ b/manifest.json @@ -11,6 +11,11 @@ "email": "julien.malik@paraiso.me" }, "multi_instance": "true", + "services": [ + "nginx", + "php5-fpm", + "mysql" + ], "arguments": { "install" : [ { From 9c81fe1a20999b51c05620317a9a30a9d66d50b4 Mon Sep 17 00:00:00 2001 From: julienmalik Date: Mon, 18 Jan 2016 13:13:25 +0100 Subject: [PATCH 8/9] Add quotes around password --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1f50dc3..b5eee0c 100644 --- a/scripts/install +++ b/scripts/install @@ -31,7 +31,7 @@ sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../sources/Core/Re sudo yunohost app setting baikal mysqlpwd -v $db_pwd sed -i "s@YNH_TIMEZONE@$(cat /etc/timezone)@g" ../conf/config.php sed -i "s@YNH_ADMIN_PASSWORDHASH@$(echo -n admin:BaikalDAV:$password | md5sum | cut -d ' ' -f 1)@g" ../conf/config.php -sudo yunohost app setting baikal password -v $password +sudo yunohost app setting baikal password -v "$password" sed -i "s@YNH_LOCATION@$path@g" ../conf/config.system.php sed -i "s@YNH_DBNAME@$db_user@g" ../conf/config.system.php From d4b6eb48638fd5f99ff8cad9a0a779d3d90a572c Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Mon, 28 Mar 2016 18:42:15 +0200 Subject: [PATCH 9/9] add "packaging_format" key to manifest.json Following the decision taken during last meeting. See "## Format version (packaging_version)" here http://pv.yunohost.org/meeting/63-yunohost-3-2016/ --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index 767d370..dc172e5 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,7 @@ { "name": "Baikal", "id": "baikal", + "packaging_format": 1, "description": { "en": "Lightweight CalDAV+CardDAV server", "fr": "Serveur CalDAV+CardDAV léger"