some correction

This commit is contained in:
frju365 2019-01-02 21:59:23 +01:00
parent 696f504637
commit 93eb538bec
No known key found for this signature in database
GPG key ID: 59BFB76C5925FC73
3 changed files with 28 additions and 14 deletions

View file

@ -3,5 +3,3 @@ SOURCE_SUM=98f6c763ebb269ac36fa445c614ba0c17d6231515c4cf542e4a382f86706fdad97931
SOURCE_SUM_PRG=sha512sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_EXTRACT=true
SOURCE_FILENAME=panel.tar.gz

View file

@ -53,7 +53,7 @@
},
"example": "johndoe"
},
{
"name": "is_public",
"type": "boolean",
@ -62,6 +62,19 @@
"fr": "Est-ce un site public ?"
},
"default": "true"
},
{
"name": "password",
"type": "password",
"ask": {
"en": "Set the administrator password",
"fr": "Définissez le mot de passe administrateur"
},
"help": {
"en": "Use the help field to add an information for the admin about this question.",
"fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
},
"example": "Choose a password"
}
]
}

View file

@ -29,6 +29,7 @@ domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN
is_public=$YNH_APP_ARG_IS_PUBLIC
password=$YNH_APP_ARG_PASSWORD
### If it's a multi-instance app, meaning it can be installed several times independently
### The id of the app as stated in the manifest is available as $YNH_APP_ID
@ -71,13 +72,6 @@ ynh_app_setting_set $app is_public $is_public
#==============================================
# INSTALL DEPS
#==============================================
## Install MariaDB 10.1
#ynh_package_install software-properties-common dirmngr mariadb-common mariadb-server mariadb-client
ynh_package_install software-properties-common dirmngr
## Start mariadb
#systemctl start mariadb
#systemctl enable mariadb
## Install the PHP 7.2 repo for debian
ynh_package_install ca-certificates apt-transport-https
@ -87,10 +81,7 @@ echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.li
## Get apt updates
ynh_package_update
#ynh_install_php7
## Install PHP 7.2
ynh_package_install php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-curl php7.2-zip
ynh_install_app_dependencies php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-curl php7.2-zip software-properties-common dirmngr
## Start php7
systemctl enable php7.2-fpm
@ -158,6 +149,18 @@ php -r "if (hash_file('sha384', 'composer-setup.php') === '93b54496392c062774670
php composer-setup.php --install-dir=/usr/bin --filename=composer
php -r "unlink('composer-setup.php');"
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
### downloaded from an upstream source, like a git repository.
### `ynh_setup_source` use the file conf/app.src
ynh_app_setting_set $app final_path $final_path
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source "$final_path"
#==============================================
# Install Pterodactyl
#==============================================