mirror of
https://github.com/YunoHost-Apps/emailpoubelle_ynh.git
synced 2024-09-03 18:26:29 +02:00
Fix
This commit is contained in:
yalh76
parent
a4f6fe12ac
commit
c4d80105e3
7 changed files with 14 additions and 31 deletions
|
|
@ -50,7 +50,7 @@ define('CRON', false);
|
|||
define('FICHIERALIAS', DATA.'/virtual');
|
||||
define('BIN_POSTMAP', '/usr/sbin/postmap');
|
||||
|
||||
define('URLPAGE', 'http://'.$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"]);
|
||||
define('URLPAGE', 'https://'.$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"]);
|
||||
|
||||
// Email
|
||||
define('EMAILTAGSUJET', '[EmailPoubelle]');
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="description" content="">
|
||||
<meta name="robots" content="index,follow,noarchive">
|
||||
<link rel="stylesheet" href="__DOMAIN__/style.css">
|
||||
<!--[if IE]><script src="__DOMAIN__/html5-ie.js"></script><![endif]-->
|
||||
<link rel="stylesheet" href="__PATH__/template-exemple/style.css">
|
||||
<!--[if IE]><script src="__PATH__/template-exemple/html5-ie.js"></script><![endif]-->
|
||||
</head>
|
||||
<body>
|
||||
<!--[if lte IE 6]>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<![endif]-->
|
||||
<div id="a">
|
||||
<header>
|
||||
<a href="/" title="Startseite"><strong>EmailPoubelle</strong> </a>
|
||||
<a href="__PATH__/" title="Startseite"><strong>EmailPoubelle</strong> </a>
|
||||
</header>
|
||||
<div id="b">
|
||||
<article style="float:left">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
location __PATH__/ {
|
||||
|
||||
# Path to source
|
||||
alias __FINALPATH__/;
|
||||
alias __FINALPATH__/www/ ;
|
||||
|
||||
index index.php;
|
||||
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ request_terminate_timeout = 1d
|
|||
; Chdir to this directory at the start.
|
||||
; Note: relative path can be used.
|
||||
; Default Value: current directory or / when chroot
|
||||
chdir = __FINALPATH__
|
||||
chdir = __FINALPATH__/www
|
||||
|
||||
; Redirect worker stdout and stderr into main error log. If not set, stdout and
|
||||
; stderr will be redirected to /dev/null according to FastCGI specs.
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ ynh_install_app_dependencies $pkg_dependencies
|
|||
|
||||
#install locale (nginx will restart at the end of the install)
|
||||
for i in $lang ; do
|
||||
ynh_replace_string "# $i" "$i" /etc/locale.gen
|
||||
ynh_replace_string --match_string="# $i" --replace_string="$i" --target_file="/etc/locale.gen"
|
||||
done
|
||||
|
||||
locale-gen
|
||||
|
|
@ -91,24 +91,14 @@ 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"
|
||||
ynh_add_config --template="../conf/index_source.php" --destination="$final_path/www/index.php"
|
||||
ynh_secure_remove --file="$final_path/www/admin.php"
|
||||
|
||||
#Temporaire - mettre en config
|
||||
ln -s $final_path/lang/fr $final_path/lang/fr_FR
|
||||
ln -s $final_path/lang/it $final_path/lang/it_IT
|
||||
ln -s $final_path/www/template-exemple $final_path/template-exemple
|
||||
ln -s $final_path/lib $final_path/www/lib
|
||||
|
||||
chmod 750 "$final_path"
|
||||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring NGINX web server..."
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
|
|
@ -145,7 +135,7 @@ yunohost tools regen-conf postfix
|
|||
# Create the virtual aliases file
|
||||
touch $final_path/var/virtual
|
||||
postmap $final_path/var/virtual
|
||||
chown -R www-data:www-data $final_path
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
# Create an alias for deleted junk adresses
|
||||
cp /etc/aliases /etc/aliases.emailpoubelle.bak #backup it
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ ynh_install_app_dependencies $pkg_dependencies
|
|||
|
||||
#Check & regen local
|
||||
for i in $lang ; do
|
||||
ynh_replace_string "# $i" "$i" /etc/locale.gen
|
||||
ynh_replace_string --match_string="# $i" --replace_string="$i" --target_file="/etc/locale.gen"
|
||||
done
|
||||
locale-gen
|
||||
|
||||
|
|
|
|||
|
|
@ -106,18 +106,11 @@ then
|
|||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$final_path" --keep="conf.php"
|
||||
ynh_add_config --template="../conf/index_source.php" --destination="$final_path/www/index.php"
|
||||
ynh_secure_remove --file="$final_path/www/admin.php"
|
||||
|
||||
test -e $final_path/template-exemple
|
||||
test -e $final_path/www/lib
|
||||
if [[ ! $? -eq 0 ]]; then
|
||||
ln -s $final_path/www/template-exemple $final_path/template-exemple
|
||||
fi
|
||||
|
||||
#Temporaire - mettre en config
|
||||
if [ ! -e $final_path/lang/fr_FR ]; then
|
||||
ln -s $final_path/lang/fr $final_path/lang/fr_FR
|
||||
fi
|
||||
if [ ! -e $final_path/lang/it_IT ]; then
|
||||
ln -s $final_path/lang/it $final_path/lang/it_IT
|
||||
ln -s $final_path/lib $final_path/www/lib
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue