mirror of
https://github.com/YunoHost-Apps/baikal_ynh.git
synced 2024-09-03 18:16:11 +02:00
Merge branch 'master' of https://github.com/julienmalik/baikal_ynh
This commit is contained in:
commit
de700febe6
4 changed files with 21 additions and 12 deletions
|
@ -1,5 +1,5 @@
|
||||||
location PATHTOCHANGE {
|
location PATHTOCHANGE {
|
||||||
alias ALIASTOCHANGE;
|
alias ALIASTOCHANGE/;
|
||||||
if ($scheme = http) {
|
if ($scheme = http) {
|
||||||
rewrite ^ https://$server_name$request_uri? permanent;
|
rewrite ^ https://$server_name$request_uri? permanent;
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,9 @@ location PATHTOCHANGE {
|
||||||
location ~ ^(.+\.php)(.*)$ {
|
location ~ ^(.+\.php)(.*)$ {
|
||||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||||
fastcgi_pass unix:/var/run/php5-fpm.sock;
|
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;
|
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/caldav PATHTOCHANGE/cal.php redirect;
|
||||||
#rewrite ~ ^/.well-known/carddav PATHTOCHANGE/card.php redirect;
|
#rewrite ~ ^/.well-known/carddav PATHTOCHANGE/card.php redirect;
|
||||||
|
|
|
@ -1,20 +1,27 @@
|
||||||
{
|
{
|
||||||
"name": "Baikal",
|
"name": "Baikal",
|
||||||
"id": "baikal",
|
"id": "baikal",
|
||||||
|
"packaging_format": 1,
|
||||||
"description": {
|
"description": {
|
||||||
"en": "Lightweight CalDAV+CardDAV server",
|
"en": "Lightweight CalDAV+CardDAV server",
|
||||||
"fr": "Serveur CalDAV+CardDAV léger"
|
"fr": "Serveur CalDAV+CardDAV léger"
|
||||||
},
|
},
|
||||||
"developer": {
|
"url": "http://baikal-server.com/",
|
||||||
|
"maintainer": {
|
||||||
"name": "julien",
|
"name": "julien",
|
||||||
"email": "julien.malik@paraiso.me",
|
"email": "julien.malik@paraiso.me"
|
||||||
"url": "https://github.com/julienmalik"
|
|
||||||
},
|
},
|
||||||
"multi_instance": "true",
|
"multi_instance": "true",
|
||||||
|
"services": [
|
||||||
|
"nginx",
|
||||||
|
"php5-fpm",
|
||||||
|
"mysql"
|
||||||
|
],
|
||||||
"arguments": {
|
"arguments": {
|
||||||
"install" : [
|
"install" : [
|
||||||
{
|
{
|
||||||
"name": "domain",
|
"name": "domain",
|
||||||
|
"type": "domain",
|
||||||
"ask": {
|
"ask": {
|
||||||
"en": "Choose a domain for baikal"
|
"en": "Choose a domain for baikal"
|
||||||
},
|
},
|
||||||
|
@ -22,6 +29,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "path",
|
"name": "path",
|
||||||
|
"type": "path",
|
||||||
"ask": {
|
"ask": {
|
||||||
"en": "Choose a path for baikal"
|
"en": "Choose a path for baikal"
|
||||||
},
|
},
|
||||||
|
@ -30,6 +38,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "password",
|
"name": "password",
|
||||||
|
"type": "password",
|
||||||
"ask": {
|
"ask": {
|
||||||
"en": "Choose a password for baikal admin"
|
"en": "Choose a password for baikal admin"
|
||||||
},
|
},
|
||||||
|
|
|
@ -21,8 +21,8 @@ final_path=/var/www/baikal
|
||||||
sudo mkdir -p $final_path
|
sudo mkdir -p $final_path
|
||||||
sudo cp -a ../sources/* $final_path
|
sudo cp -a ../sources/* $final_path
|
||||||
sudo chown -R www-data: $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 "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" www-data
|
sudo su -c "cd $final_path && php composer.phar install" -s /bin/sh www-data
|
||||||
sudo rm $final_path/composer*
|
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')
|
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')
|
||||||
|
@ -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
|
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_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
|
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_LOCATION@$path@g" ../conf/config.system.php
|
||||||
sed -i "s@YNH_DBNAME@$db_user@g" ../conf/config.system.php
|
sed -i "s@YNH_DBNAME@$db_user@g" ../conf/config.system.php
|
||||||
|
|
|
@ -18,8 +18,8 @@ sudo rm -rf /var/www/baikal
|
||||||
sudo mkdir -p $final_path
|
sudo mkdir -p $final_path
|
||||||
sudo cp -a ../sources/* $final_path
|
sudo cp -a ../sources/* $final_path
|
||||||
sudo chown -R www-data: $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 "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" www-data
|
sudo su -c "cd $final_path && php composer.phar install" -s /bin/sh www-data
|
||||||
sudo rm $final_path/composer*
|
sudo rm $final_path/composer*
|
||||||
|
|
||||||
db_pwd=$(sudo yunohost app setting baikal mysqlpwd)
|
db_pwd=$(sudo yunohost app setting baikal mysqlpwd)
|
||||||
|
|
Loading…
Add table
Reference in a new issue