Correction suppression images

conf/cron_lutim

@@ -1,5 +1,4 @@
 # Génération des statistiques. Tous les jours, à 5h.
-# 0 5 * * * www-data carton exec script/lutim cron stats && carton exec hypnotoad __FINALPATH__/script/lutim
 0 5 * * * www-data cd "__FINALPATH__" && /usr/local/bin/carton exec script/lutim cron stats
 
 # Suppression des adresses IP obsolètes. Tous les jours, à 6h.

scripts/install

@@ -64,10 +64,6 @@ sudo cp -a lutim/. "$final_path"
 sudo cp -a ../sources/ajouts/. "$final_path"
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
-# Installation du module perl carton
-## echo "Installation du module perl carton. Attention, étape très longue..."
-## yes | sudo cpan Carton 2>&1 | sudo tee "/var/log/$app/setup_carton.log" > /dev/null
-
 # Installation de perlmagick, interface perl pour imagemagick et de carton, gestionnaire de dépendances perl
 sudo apt-get update
 sudo apt-get install carton perlmagick -qy
@@ -104,9 +100,16 @@ sudo mkdir -p /var/log/$app/
 cd $final_path
 sudo carton install 2>&1 | sudo tee -a "/var/log/$app/setup_carton.log"
 
+# Configure le path du dossier perl en fonction de l'architecture système
+arch_dir=$(ls -1 $final_path/local/lib/perl5/ | grep linux-gnu)
+if [ "$?" -ne 0 ]
+then
+    echo "Impossible de trouver le dossier relatif à l'architecture système." | sudo tee -a "/var/log/$app/setup_carton.log"
+fi
+sudo sed -i "s@__ARCHDIR__@$arch_dir@g" "$final_path/script/lutim"
+
 ## Démarrage auto des scripts init
 sudo update-rc.d lutim defaults
-# sudo update-rc.d -f lutim remove
 
 # Change variables in nginx configuration
 sudo sed -i "s@__PATH__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf
@@ -122,7 +125,6 @@ fi
 # Making log symbolic link to /var/log
 sudo touch /var/log/$app/production.log 
 sudo chown www-data: /var/log/$app/production.log
-# sudo rm -f /var/www/$app/log/production.log
 sudo ln -s /var/log/$app/production.log "$final_path/log/production.log"
 
 # Set right permissions

scripts/upgrade

@@ -50,6 +50,10 @@ sudo sed -i "s@__FINALPATH__@$final_path/@g" /etc/default/lutim
 sudo cp ../conf/cron_lutim /etc/cron.d/$app
 sudo sed -i "s@__FINALPATH__@$final_path/@g" /etc/cron.d/$app
 
+# Mise à jour de lutim via carton
+cd $final_path
+sudo carton install 2>&1 | sudo tee -a "/var/log/$app/setup_carton.log"
+
 # Make app public or private
 sudo yunohost app setting $app skipped_uris -v "/"
 if [ "$is_public" = "No" ];

sources/ajouts/cpanfile

@@ -1,15 +0,0 @@
-requires 'Mojolicious';
-requires 'EV';
-requires 'Data::Validate::URI';
-requires 'Mojolicious::Plugin::I18N';
-requires 'Mojolicious::Plugin::AssetPack';
-requires 'ORLite';
-requires 'File::Type';
-requires 'Text::Unidecode';
-requires 'DateTime';
-requires 'Filesys::DiskUsage';
-requires 'Switch';
-requires 'Data::Validate::URI';
-requires 'Crypt::CBC';
-requires 'Crypt::Blowfish';
-requires "IO::Socket::SSL";

sources/ajouts/script/lutim

@@ -6,7 +6,7 @@ use warnings;
 use FindBin;
 BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 BEGIN { unshift @INC, "$FindBin::Bin/../local/lib/perl5" }
-BEGIN { unshift @INC, "$FindBin::Bin/../local/lib/perl5/i486-linux-gnu-thread-multi-64int" }
+BEGIN { unshift @INC, "$FindBin::Bin/../local/lib/perl5/__ARCHDIR__" }
 
 # Start command line interface for application
 require Mojolicious::Commands;