YunoHost-Apps/flarum_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/flarum_ynh.git synced 2024-09-03 18:36:24 +02:00
Code Issues Activity Actions

Better composer installation and fix typo

Browse source 
Addresses #9 :

If `composer` is not installed, php5-fpm ENV is now firstly updated to set `/var/www/.composer` as `composer` 's home.
Fix a typo where future automatic postinstall asked for `configuration.ymls` instead of `.yml`
This commit is contained in:
Titus PiJean 2016-10-12 19:57:40 +02:00
parent 11103ad7a7
commit 76d6c8f7b9
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
manifest.json
View file

@ -43,15 +43,6 @@
"example": "/flarum", "example": "/flarum",
"default": "/flarum" "default": "/flarum"
}, },
{
"name": "title",
"ask": {
"en": "Choose a title for your forum",
"fr": "Choisissez un titre pour votre forum"
},
"example": "My forum",
"default": ""
},
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user",
@ -59,7 +50,8 @@
"en": "Choose an admin user", "en": "Choose an admin user",
"fr": "Choisissez l’administrateur" "fr": "Choisissez l’administrateur"
}, },
"example": "johndoe" "example": "johndoe",
"optional": true
}, },
{ {
"name": "adminpass", "name": "adminpass",
@ -68,7 +60,18 @@
"en": "Put your password", "en": "Put your password",
"fr": "Insérez votre mot de passe" "fr": "Insérez votre mot de passe"
}, },
"example": "******" "example": "******",
"optional": true
},
{
"name": "title",
"ask": {
"en": "Choose a title for your forum",
"fr": "Choisissez un titre pour votre forum"
},
"example": "My forum",
"default": "",
"optional": true
}, },
{ {
"name": "is_public", "name": "is_public",

17
scripts/install
View file

@ -41,6 +41,11 @@ sudo mkdir -p $tmp
sudo chown -R www-data:www-data $tmp sudo chown -R www-data:www-data $tmp
sudo chmod -R 755 $tmp sudo chmod -R 755 $tmp
# Prepare composer and cache directories
sudo mkdir -p /var/www/.composer/cache
sudo chown -R www-data:www-data /var/www/.composer
sudo chmod -R 755 /var/www/.composer
### composer ### ### composer ###
if ! type "composer" > /dev/null; then if ! type "composer" > /dev/null; then
# Install composer (https://getcomposer.org) # Install composer (https://getcomposer.org)
@ -49,9 +54,8 @@ if ! type "composer" > /dev/null; then
ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', '$tmp/composer-setup.php');") ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', '$tmp/composer-setup.php');")
if [ "$EXPECTED_SIGNATURE" = "$ACTUAL_SIGNATURE" ] if [ "$EXPECTED_SIGNATURE" = "$ACTUAL_SIGNATURE" ]
then then
sudo mkdir /var/www/.composer sudo su - root -c "grep -q -F 'env[COMPOSER_HOME]= /var/www/.composer' /etc/php5/fpm/php-fpm.conf || sudo echo 'env[COMPOSER_HOME]= /var/www/.composer' >> /etc/php5/fpm/php-fpm.conf"
sudo chown -R www-data:www-data /var/www/.composer sudo service php5-fpm reload
sudo chmod -R 755 /var/www/.composer
sudo su - www-data -s /bin/bash -c "php $tmp/composer-setup.php --install-dir=$tmp --filename=composer" sudo su - www-data -s /bin/bash -c "php $tmp/composer-setup.php --install-dir=$tmp --filename=composer"
sudo mv $tmp/composer /usr/local/bin sudo mv $tmp/composer /usr/local/bin
sudo chown root:root /usr/local/bin/composer sudo chown root:root /usr/local/bin/composer
@ -66,9 +70,6 @@ if ! type "composer" > /dev/null; then
exit $RESULT exit $RESULT
fi fi
fi fi
sudo mkdir -p /var/www/.composer
sudo chown -R www-data:www-data /var/www/.composer
sudo chmod -R 755 /var/www/.composer
### composer end ### ### composer end ###
### Install flarum ### Install flarum
@ -117,9 +118,10 @@ fi
sudo service nginx reload sudo service nginx reload
### POST-INSTALL ### ### POST-INSTALL ###
if [[ -n $adminpass && -n $title ]]; then
sed -i "s@YNH_APP_DOMAIN@$domain@g" ../sources/configuration.yml sed -i "s@YNH_APP_DOMAIN@$domain@g" ../sources/configuration.yml
sed -i "s@/YNH_WWW_PATH@$path@g" ../sources/configuration.yml sed -i "s@/YNH_WWW_PATH@$path@g" ../sources/configuration.yml
sed -i "s@YNH_WWW_APP@$app@g" ../sources/configuration.ymls sed -i "s@YNH_WWW_APP@$app@g" ../sources/configuration.yml
sed -i "s@YNH_DB_PASS@$dbpass@g" ../sources/configuration.yml sed -i "s@YNH_DB_PASS@$dbpass@g" ../sources/configuration.yml
sed -i "s@YNH_ADMIN_USER@$admin@g" ../sources/configuration.yml sed -i "s@YNH_ADMIN_USER@$admin@g" ../sources/configuration.yml
sed -i "s@YNH_ADMIN_PASS@$adminpass@g" ../sources/configuration.yml sed -i "s@YNH_ADMIN_PASS@$adminpass@g" ../sources/configuration.yml
@ -129,6 +131,7 @@ sed -i "s@YNH_FORUM_TITLE@$title@g" ../sources/configuration.yml
sudo cp ../sources/configuration.yml $final_path sudo cp ../sources/configuration.yml $final_path
#sudo su - www-data -s /bin/bash -c "cd $final_path && php -d memory_limit=-1 flarum install -f configuration.yml" #sudo su - www-data -s /bin/bash -c "cd $final_path && php -d memory_limit=-1 flarum install -f configuration.yml"
sudo rm $final_path/configuration.yml sudo rm $final_path/configuration.yml
fi
# Tell user the MySQL credentials for post-installation # Tell user the MySQL credentials for post-installation
echo "MySQL database user is " $dbuser echo "MySQL database user is " $dbuser