YunoHost-Apps/aeneria_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/aeneria_ynh.git synced 2024-09-03 18:06:15 +02:00
Code Issues Activity Actions

Fix install relative path

Browse source
This commit is contained in:
Simon Mellerin 2023-12-22 18:22:03 +01:00
parent 9e4a991e87
commit a2d777ddf4
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/aeneria.cron
View file

@ -1,2 +1,2 @@
__MINUTES__ __HOUR__-23/3 * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/app/bin/console aeneria:fetch-data __MINUTES__ __HOUR__-23/3 * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/bin/console aeneria:fetch-data
*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/app/bin/console aeneria:pending-action:process-expired */15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/bin/console aeneria:pending-action:process-expired

2
conf/nginx.conf
View file

@ -2,7 +2,7 @@
location __PATH__/ { location __PATH__/ {
# Path to source # Path to source
alias __INSTALL_DIR__/app/public/; alias __INSTALL_DIR__/public/;
client_body_timeout 60m; client_body_timeout 60m;
proxy_read_timeout 60m; proxy_read_timeout 60m;

6
scripts/install
View file

@ -45,10 +45,10 @@ ynh_add_fpm_config
#================================================= #=================================================
ynh_script_progression --message="Configuring $app..." --weight=1 ynh_script_progression --message="Configuring $app..." --weight=1
ynh_add_config --template=".env" --destination="$install_dir/app/.env" ynh_add_config --template=".env" --destination="$install_dir/.env"
# Restrict rights to aeneria user only # Restrict rights to aeneria user only
chmod 600 "$install_dir/app/.env" chmod 600 "$install_dir/.env"
#================================================= #=================================================
# INSTALL AENERIA # INSTALL AENERIA
@ -56,7 +56,7 @@ chmod 600 "$install_dir/app/.env"
ynh_script_progression --message="Installing aeneria..." --weight=1 ynh_script_progression --message="Installing aeneria..." --weight=1
# Install aeneria # Install aeneria
pushd $install_dir/app pushd $install_dir
ynh_exec_as $app php$phpversion bin/console aeneria:install "$app" -n ynh_exec_as $app php$phpversion bin/console aeneria:install "$app" -n
# Create admin user # Create admin user
mail=$(ynh_user_get_info --username="$admin" --key='mail') mail=$(ynh_user_get_info --username="$admin" --key='mail')

6
scripts/upgrade
View file

@ -79,10 +79,10 @@ chmod 644 "/etc/cron.d/$app"
#================================================= #=================================================
ynh_script_progression --message="Configuring $app..." --weight=1 ynh_script_progression --message="Configuring $app..." --weight=1
ynh_add_config --template=".env" --destination="$install_dir/app/.env" ynh_add_config --template=".env" --destination="$install_dir/.env"
# Restrict rights to aeneria user only # Restrict rights to aeneria user only
chmod 600 "$install_dir/app/.env" chmod 600 "$install_dir/.env"
#================================================= #=================================================
# UPGRADE AENERIA # UPGRADE AENERIA
@ -90,7 +90,7 @@ chmod 600 "$install_dir/app/.env"
ynh_script_progression --message="Upgrading $app..." --weight=1 ynh_script_progression --message="Upgrading $app..." --weight=1
# Install dependencies and aeneria # Install dependencies and aeneria
pushd $install_dir/app pushd $install_dir
ynh_exec_as $app php$phpversion bin/console cache:clear -n ynh_exec_as $app php$phpversion bin/console cache:clear -n
ynh_exec_as $app php$phpversion bin/console doctrine:migrations:migrate -n ynh_exec_as $app php$phpversion bin/console doctrine:migrations:migrate -n

16
sources/patches/app-00-ldap-auth.patch
View file

@ -4,10 +4,10 @@ Date: Fri Dec 22 17:22:41 2023 +0100
Yunohost ldap Yunohost ldap
diff --git a/app/config/packages/security.yaml b/app/config/packages/security.yaml diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index 6c4457f1..ea1f3dc9 100644 index 6c4457f1..ea1f3dc9 100644
--- a/app/config/packages/security.yaml --- a/config/packages/security.yaml
+++ b/app/config/packages/security.yaml +++ b/config/packages/security.yaml
@@ -11,6 +11,8 @@ security: @@ -11,6 +11,8 @@ security:
entity: entity:
class: App\Entity\User class: App\Entity\User
@ -28,10 +28,10 @@ index 6c4457f1..ea1f3dc9 100644
logout: logout:
path: security.logout path: security.logout
target: security.login target: security.login
diff --git a/app/config/services.yaml b/app/config/services.yaml diff --git a/config/services.yaml b/config/services.yaml
index 4410bfc5..71b9ba86 100644 index 4410bfc5..71b9ba86 100644
--- a/app/config/services.yaml --- a/config/services.yaml
+++ b/app/config/services.yaml +++ b/config/services.yaml
@@ -105,3 +105,16 @@ services: @@ -105,3 +105,16 @@ services:
Aeneria\GrdfAdictApi\Client\GrdfAdictClientInterface: Aeneria\GrdfAdictApi\Client\GrdfAdictClientInterface:
@ -49,11 +49,11 @@ index 4410bfc5..71b9ba86 100644
+ class: Symfony\Component\Ldap\Adapter\ExtLdap\Adapter + class: Symfony\Component\Ldap\Adapter\ExtLdap\Adapter
+ arguments: + arguments:
+ - host: "localhost" + - host: "localhost"
diff --git a/app/src/Security/YunohostLdapUserProvider.php b/app/src/Security/YunohostLdapUserProvider.php diff --git a/src/Security/YunohostLdapUserProvider.php b/src/Security/YunohostLdapUserProvider.php
new file mode 100644 new file mode 100644
index 00000000..09ad20c6 index 00000000..09ad20c6
--- /dev/null --- /dev/null
+++ b/app/src/Security/YunohostLdapUserProvider.php +++ b/src/Security/YunohostLdapUserProvider.php
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
+<?php +<?php
+ +