diff --git a/conf/nginx.conf b/conf/nginx.conf index cfdefca..500ebf8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,7 @@ location __PATH__/ { try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm.sock; fastcgi_index index.php; include fastcgi_params; diff --git a/scripts/install b/scripts/install index 79cc5a7..f4209bd 100644 --- a/scripts/install +++ b/scripts/install @@ -49,18 +49,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# CREATE A MYSQL DATABASE -#================================================= -# ynh_script_progression --message="Creating a MySQL database..." --weight=2 - -# db_name=$(ynh_sanitize_dbid $app) -# ynh_app_setting_set --app=$app --key=db_name --value=$db_name -# ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name -# db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -78,14 +66,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -# ynh_script_progression --message="Configuring system user..." --weight=2 - -# # Create a system user -# ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -95,30 +75,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#================================================= -# SPECIFIC SETUP -#================================================= -# CONFIGURE TTRSS -#================================================= -# ynh_script_progression --message="Configuring ttrss..." --weight=1 - -# cp ../conf/config.php "$final_path/config.php" - -# # Change variables in ttrss configuration -# ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$final_path/config.php" -# ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$final_path/config.php" -# ynh_replace_string --match_string="__DOMAINPATH__" --replace_string="https://$domain$path_url" --target_file="$final_path/config.php" - -# # Recalculate and store the config file checksum into the app settings -# ynh_store_file_checksum --file="$final_path/config.php" - -#================================================= -# SETUP SYSTEMD -#================================================= -# ynh_script_progression --message="Configuring a systemd service..." --weight=2 - -# ynh_add_systemd_config - #================================================= # SECURE FILES AND DIRECTORIES #================================================= @@ -126,31 +82,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) # Set permissions to app files chown -R root: $final_path -#================================================= -# INITIALIZE DATABASE -#================================================= -# ynh_script_progression --message="Initializing database..." --weight=6 - -# ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \ -# < "$final_path/schema/ttrss_schema_mysql.sql" - -# ynh_exec_as $app php"${phpversion}" ${final_path}/update.php --update-schema - -#================================================= -# START TTRSS IN BACKGROUND -#================================================= -# ynh_script_progression --message="Starting ttrss..." --weight=1 - -# ynh_systemd_action --service_name=$app --action=start - -#================================================= -# GENERIC FINALIZATION -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - -# yunohost service add $app - #================================================= # SETUP SSOWAT #=================================================