Merge pull request #2 from julienmalik/master

merge with latest sources from fork

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;
-}
+}

manifest.json

@@ -5,16 +5,17 @@
         "en": "Lightweight CalDAV+CardDAV server",
         "fr": "Serveur CalDAV+CardDAV léger"
     },
-    "developer": {
+    "url": "http://baikal-server.com/",
-        "name": "aquaxp",
+    "maintainer": {
-        "email": "n@a.ru",
+        "name": "julien",
-        "url": "https://github.com/aquaxp"
+        "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"
                 },
@@ -29,7 +31,8 @@
                 "default": "/baikal"
             },
             {
-                "name": "admin_pwd",
+                "name": "password",
+                "type": "password",
                 "ask": {
                     "en": "Choose a password for baikal admin"
                 },

scripts/install

@@ -3,7 +3,7 @@
 # Retrieve arguments
 domain=$1
 path=$2
-admin_pwd=$3
+password=$3
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a baikal
@@ -30,7 +30,8 @@ db_user=baikal
 sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../sources/Core/Resources/Db/MySQL/db.sql)
 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:$admin_pwd | 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
 
 sed -i "s@YNH_LOCATION@$path@g" ../conf/config.system.php
 sed -i "s@YNH_DBNAME@$db_user@g" ../conf/config.system.php

scripts/upgrade

@@ -1,41 +1,90 @@
 #!/bin/bash
 
 # Retrieve arguments
-domain=$(sudo yunohost app setting owncloud domain)
+domain=$(sudo yunohost app setting baikal domain)
-path=$(sudo yunohost app setting owncloud path)
+path=$(sudo yunohost app setting baikal path)
+password=$(sudo yunohost app setting baikal password)
 
 # Remove trailing "/" for next commands
 path=${path%/}
 
-# Backuping db
-backup_path=/var/cache/yunohost/backups/baikal
-final_path=/var/www/baikal/
-
-mkdir -p $backup_path
-sudo cp -a $final_path/Specific/* $backup_path 
 
 # Copy files to the right place
+final_path=/var/www/baikal
+
+# let's not use a bash variable for this one...
+sudo rm -rf /var/www/baikal
+
 sudo mkdir -p $final_path
 sudo cp -a ../sources/* $final_path
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/baikal.conf
+sudo chown -R www-data: $final_path
-sudo chown -R www-data:www-data $final_path
+sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" www-data
-sudo find $final_path -type d -exec chmod 755 {} \;
+sudo su -c "cd $final_path && php composer.phar install" www-data
-sudo touch $final_path/Specific/ENABLE_INSTALL
+sudo rm $final_path/composer*
-#sudo chmod 755 $final_path/Specific
+
-#sudo chmod 755 $final_path/Specific/db
+db_pwd=$(sudo yunohost app setting baikal mysqlpwd)
-#sudo chmod 755 $final_path/Specific/db/db.sqlite
+db_user=baikal
+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_LOCATION@$path@g" ../conf/config.system.php
+sed -i "s@YNH_DBNAME@$db_user@g" ../conf/config.system.php
+sed -i "s@YNH_DBUSER@$db_user@g" ../conf/config.system.php
+sed -i "s@YNH_DBPWD@$db_pwd@g" ../conf/config.system.php
+encrypt_key=$(sudo yunohost app setting baikal encrypt_key)
+sed -i "s@YNH_ENCRYPTKEY@$encrypt_key@g" ../conf/config.system.php
+
+sudo cp ../conf/config.php $final_path/Specific
+sudo cp ../conf/config.system.php $final_path/Specific
+
+sudo chown -R root: $final_path
+sudo chown -R www-data: $final_path/Specific
+sudo find $final_path -type f | xargs sudo chmod 644
+sudo find $final_path -type d | xargs sudo chmod 755
 
 # Change variables in Baikal configuration
-sudo sed -i "s@PATHTOCHANGE@$path@g" /etc/nginx/conf.d/$domain.d/baikal.conf
+sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
-sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" /etc/nginx/conf.d/$domain.d/baikal.conf
+sed -i "s@ALIASTOCHANGE@$final_path/html@g" ../conf/nginx.conf
-
+sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/baikal.conf
-sudo sed -i "s@PROJECT_BASEURI_@\"$path/\"@g" $final_path/Core/Frameworks/Baikal/Model/Config/System.php
+sudo chown root: /etc/nginx/conf.d/$domain.d/baikal.conf
-
+sudo chmod 600 /etc/nginx/conf.d/$domain.d/baikal.conf
-# Restoring backup
-sudo cp -a $backup_path/* $final_path/Specific
 
 # Reload Nginx and regenerate SSOwat conf
-sudo service php5-fpm restart
 sudo service nginx reload
 sudo yunohost app setting baikal skipped_uris -v "/"
 sudo yunohost app ssowatconf
+
+
+# 
+# # Backuping db
+# backup_path=/var/cache/yunohost/backups/baikal
+# final_path=/var/www/baikal/
+# 
+# mkdir -p $backup_path
+# sudo cp -a $final_path/Specific/* $backup_path 
+# 
+# # Copy files to the right place
+# sudo mkdir -p $final_path
+# sudo cp -a ../sources/* $final_path
+# sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/baikal.conf
+# sudo chown -R www-data:www-data $final_path
+# sudo find $final_path -type d -exec chmod 755 {} \;
+# sudo touch $final_path/Specific/ENABLE_INSTALL
+# #sudo chmod 755 $final_path/Specific
+# #sudo chmod 755 $final_path/Specific/db
+# #sudo chmod 755 $final_path/Specific/db/db.sqlite
+# 
+# # Change variables in Baikal configuration
+# sudo sed -i "s@PATHTOCHANGE@$path@g" /etc/nginx/conf.d/$domain.d/baikal.conf
+# sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" /etc/nginx/conf.d/$domain.d/baikal.conf
+# 
+# sudo sed -i "s@PROJECT_BASEURI_@\"$path/\"@g" $final_path/Core/Frameworks/Baikal/Model/Config/System.php
+# 
+# # Restoring backup
+# sudo cp -a $backup_path/* $final_path/Specific
+# 
+# # Reload Nginx and regenerate SSOwat conf
+# sudo service php5-fpm restart
+# sudo service nginx reload
+# sudo yunohost app setting baikal skipped_uris -v "/"
+# sudo yunohost app ssowatconf