diff --git a/check_process b/check_process index 56af549..344c863 100644 --- a/check_process +++ b/check_process @@ -6,7 +6,6 @@ language="fr" password="pass" admin="john" - port="9980" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -17,7 +16,6 @@ upgrade=1 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=0 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 3650058..02ddfca 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pterodactyl/panel/releases/download/v1.2.2/panel.tar.gz -SOURCE_SUM=e03a532623a62adf36c4b2769a90ed0a38954af1645d453bee0e470651e9aaf2 +SOURCE_URL=https://github.com/pterodactyl/panel/releases/download/v1.6.6/panel.tar.gz +SOURCE_SUM=232a131448872837f29f285fa0f7be19b39062abf3a9ef617f4b985b03cc27a6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/cron b/conf/cron index 2effc54..0392b04 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -* * * * * php__PHPVERSION__ __FINALPATH__/artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index b69db21..cb74753 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -23,10 +23,6 @@ index index.php; location __PATH__/ { try_files $uri $uri/ /index.php?$query_string; - # Force https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; diff --git a/manifest.json b/manifest.json index 18bc21a..a20610e 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "pterodactyl", "packaging_format": 1, "description": { - "en": "Gameserver management panel (Minecraft, ARK, Rust,...)", - "fr": "Panel de gestion de serveurs de jeux (Minecraft, ARK, Rust,...)" + "en": "Gameserver management panel (Minecraft, ARK, Rust...)", + "fr": "Panel de gestion de serveurs de jeux (Minecraft, ARK, Rust...)" }, - "version": "1.2.2~ynh1", + "version": "1.6.6~ynh1", "url": "https://pterodactyl.io/", "license": "MIT", "maintainer": { @@ -14,7 +14,7 @@ "email": "aeris@e.email" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -25,8 +25,7 @@ "arguments": { "install": [{ "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -51,8 +50,7 @@ }, { "name": "password", - "type": "password", - "example": "Choose a password" + "type": "password" }, { "name": "is_public", diff --git a/scripts/_common.sh b/scripts/_common.sh index 6e1bd0a..81be90b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,18 +4,15 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION=7.3 +# Composer version +YNH_COMPOSER_VERSION="2.1.3" -nodejs_version=14 +YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip" +nodejs_version="14" -pkg_dependencies="libargon2-1 libsodium23 apt-transport-https unzip tar make gcc g++" +pkg_dependencies="libargon2-1 libsodium23 apt-transport-https unzip tar make gcc g++ php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip" #================================================= # EXPERIMENTAL HELPERS #================================================= - -#======================= -# COMPOSER -#======================= diff --git a/scripts/install b/scripts/install index a2631ff..748b180 100644 --- a/scripts/install +++ b/scripts/install @@ -84,6 +84,14 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=1 + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -93,6 +101,11 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +# Set permissions to app files +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -101,14 +114,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index c334a77..7f8c096 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,10 +40,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --time --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index da00503..95952e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,15 +35,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1 -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app)