ericgaspar 4 år sedan
förälder
incheckning
332a57b086
5 ändrade filer med 5 tillägg och 17 borttagningar
  1. 2 2
      conf/nginx.conf
  2. 0 8
      manifest.json
  3. 1 5
      scripts/install
  4. 1 1
      scripts/restore
  5. 1 1
      scripts/upgrade

+ 2 - 2
conf/nginx.conf

@@ -39,8 +39,8 @@ location __PATH__/ {
 	location ~* \.(css|js|docx|zip|pptx|swf|txt|jpg|jpeg|png|gif|swf|webp|flv|ico|pdf|avi|mov|ppt|doc|mp3|wmv|wav|mp4|m4v|ogg|webm|aac)$ {
 		expires max;
 		log_not_found off;
-		add_header Pragma public;
-		add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+		more_set_headers "Pragma: public";
+		more_set_headers "Cache-Control: public; must-revalidate; proxy-revalidate";
 	}
 
 	location ~ [^/]\.php(/|$) {

+ 0 - 8
manifest.json

@@ -56,14 +56,6 @@
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
-            },
-            {
-                "name": "password",
-                "type": "password",
-                "ask": {
-                    "en": "Set the password for the Admin user ≥ 5 character",
-                    "fr": "Définissez le mot de passe pour l'Administrateur. ≥ cinq charactères"
-                }
             }
         ]
     }

+ 1 - 5
scripts/install

@@ -24,8 +24,6 @@ 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
-#email=$(ynh_user_get_info --username=$admin --key=mail)
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -48,8 +46,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 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=admin --value=$admin
-#ynh_app_setting_set --app=$app --key=password --value=$password
-#ynh_app_setting_set --app=$app --key=email --value=$email
 
 #=================================================
 # CREATE DEDICATED USER
@@ -96,7 +92,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

+ 1 - 1
scripts/restore

@@ -74,7 +74,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # RESTORE THE MYSQL DATABASE

+ 1 - 1
scripts/upgrade

@@ -107,7 +107,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # RELOAD NGINX