diff --git a/conf/.env b/conf/.env index 3504a87..9f586c4 100644 --- a/conf/.env +++ b/conf/.env @@ -22,7 +22,7 @@ HASH_SALT=ChangeMeBy20+KeyLength HASH_LENGTH=18 # The URL of your application. -APP_URL=https://__DOMAIN__ +APP_URL=https://__DOMAIN____PATH__ # Force using APP_URL as base url of your application. # You should not need this, unless you are using subdirectory config. @@ -53,11 +53,11 @@ DB_USE_UTF8MB4=true MAIL_DRIVER=smtp MAIL_HOST=127.0.0.1 MAIL_PORT=25 -MAIL_USERNAME= -MAIL_PASSWORD= +MAIL_USERNAME=__APP__ +MAIL_PASSWORD=__MAIL_PWD__ MAIL_ENCRYPTION= # Outgoing emails will be sent with these identity -MAIL_FROM_ADDRESS=monica@__DOMAIN__ +MAIL_FROM_ADDRESS=__APP__@__DOMAIN__ MAIL_FROM_NAME="Monica" # New registration notification sent to this email APP_EMAIL_NEW_USERS_NOTIFICATION=__EMAIL__ @@ -136,7 +136,7 @@ AWS_SERVER= S3_PATH_STYLE= # Allow Two Factor Authentication feature on your instance -MFA_ENABLED=false +MFA_ENABLED=true # Enable DAV support DAV_ENABLED=true diff --git a/conf/cron b/conf/cron index 597d231..a5f4c63 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run \ No newline at end of file +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 192eb9e..638225f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,6 +59,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] + allow_email = true [resources.install_dir] diff --git a/scripts/upgrade b/scripts/upgrade index 0b38640..b53a999 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -153,6 +153,16 @@ chown $app:$app "$install_dir/.env" update-alternatives --set php /usr/bin/php${YNH_PHP_VERSION} +#================================================= +# INSTALL THE CRON FILE +#================================================= +ynh_script_progression --message="Setuping a cron..." --weight=1 + +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" + +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" + #================================================= # END OF SCRIPT #=================================================