diff --git a/conf/galene-ldap.json b/conf/galene-ldap.json index 1480001..c271256 100644 --- a/conf/galene-ldap.json +++ b/conf/galene-ldap.json @@ -1,5 +1,5 @@ { - "httpAddress": "127.0.0.1:__LDAP_PORT__", + "httpAddress": "127.0.0.1:__PORT_LDAP__", "ldapServer": "ldap://localhost:389", "ldapBase": "ou=users,dc=yunohost,dc=org", "key": __KEY__, diff --git a/conf/nginx.conf b/conf/nginx.conf index a37e798..087602d 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ location /auth/ { - proxy_pass http://127.0.0.1:__LDAP_PORT__/; + proxy_pass http://127.0.0.1:__PORT_LDAP__/; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/conf/systemd.service b/conf/systemd.service index 6b112ed..22f27a4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/live/ -ExecStart=__INSTALL_DIR__/live/galene -http "127.0.0.1:__PORT__" -insecure -turn __PUBLIC_IP4__:__TURN_PORT__ -udp-range 49152-65535 -groups __DATA_DIR__/groups -recordings __DATA_DIR__/recordings -data __INSTALL_DIR__/live/data/ +ExecStart=__INSTALL_DIR__/live/galene -http "127.0.0.1:__PORT__" -insecure -turn __PUBLIC_IP4__:__PORT_TURN__ -udp-range 49152-65535 -groups __DATA_DIR__/groups -recordings __DATA_DIR__/recordings -data __INSTALL_DIR__/live/data/ LimitNOFILE=65536 [Install] diff --git a/manifest.json b/manifest.json deleted file mode 100644 index ce78217..0000000 --- a/manifest.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "Galène", - "id": "galene", - "packaging_format": 1, - "description": { - "en": "Videoconferencing server that is easy to deploy", - "fr": "Serveur de visioconférence facile à déployer" - }, - "version": "0.6.1~ynh4", - "url": "https://galene.org/", - "upstream": { - "license": "MIT", - "website": "https://galene.org/", - "demo": "https://galene.org:8443/", - "admindoc": "https://galene.org/", - "userdoc": "https://galene.org/faq.html", - "code": "https://github.com/jech/galene" - }, - "license": "MIT", - "maintainer": { - "name": "eric_G", - "email": "" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": false, - "services": [ - "nginx" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If enabled, Galène will be accessible by people who do not have an account. This can be changed later via the webadmin.", - "fr": "Si cette case est cochée, Galène sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." - }, - "default": true - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "password", - "type": "password", - "help": { - "en": "Set the administrator password (between 8 and 30 characters)", - "fr": "Définissez le mot de passe administrateur (entre 8 et 30 caractères)" - } - }, - { - "name": "group_name", - "type": "string", - "ask": { - "en": "Choose a name for the group you want to create", - "fr": "Choisissez un nom pour le groupe que vous voulez créer" - }, - "default": "public", - "example": "public" - }, - { - "name": "group_description", - "type": "string", - "optional": true, - "ask": { - "en": "Choose a description for the group you want to create", - "fr": "Décrivez le groupe que vous souhaitez créer" - }, - "help": { - "en": "Add a human-readable description of the group; this is displayed on the landing page for public groups.", - "fr": "Ajoutez une description du groupe; ceci est affiché sur la page de destination des groupes publics." - } - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index 206919b..8991192 100644 --- a/manifest.toml +++ b/manifest.toml @@ -71,7 +71,11 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - [resources.ports] + [resources.port] + main.default = 8095 + ldap.default = 8096 + turn.default = 1194 + turn.exposed = "Both" [resources.apt] packages = "jose"