diff --git a/README.md b/README.md index 06fcff2..d0c48c0 100755 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ # Castopod for YunoHost [![Integration level](https://dash.yunohost.org/integration/castopod.svg)](https://dash.yunohost.org/appci/app/castopod) ![](https://ci-apps.yunohost.org/ci/badges/castopod.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/castopod.maintain.svg) -[![Install castopod with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=castopod) +[![Install Castopod with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=castopod) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install castopod quickly and simply on a YunoHost server. +> *This package allows you to install Castopod quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview Castopod Server is an open-source hosting platform made for podcasters who want engage and interact with their audience. Please note that Castopod is still under heavy development: it may not be 100% stable and some features are still being developed. -**Shipped version:** 1.0.0 alpha 33 +**Shipped version:** 1.0.0 alpha.33 ## Screenshots @@ -23,19 +23,20 @@ Castopod Server is an open-source hosting platform made for podcasters who want ## Configuration - * How to configure this app: From an admin panel. + * Go to `domain.ltd/cp-install` to creat an admin user. + * How to configure this app: From an admin panel `domain.ltd/cp-admin`. ## Documentation - * Official documentation: Link to the official documentation of this app + * Documentation: https://podlibre.org/create-a-podcast-in-3mn-with-castopod/ * YunoHost documentation: If specific documentation is needed, feel free to contribute. ## YunoHost specific features #### Multi-user support -Are LDAP and HTTP auth supported? -Can the app be used by multiple users? + * Are LDAP and HTTP auth supported? + * Can the app be used by multiple users? #### Supported architectures @@ -44,7 +45,7 @@ Can the app be used by multiple users? ## Limitations -* Any known limitations. +* :warning: Installation possible only on a root domain or subdomain. ## Additional information diff --git a/README_fr.md b/README_fr.md index 5a89d6c..92ce0ab 100755 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Castopod Server est une plate-forme d'hébergement open source conçue pour les podcasteurs qui souhaitent s'engager et interagir avec leur public. Veuillez noter que Castopod est toujours en développement: il n'est peut-être pas stable à 100% et certaines fonctionnalités sont encore en développement. -**Version incluse :** 1.0.0 alpha 33 +**Version incluse :** 1.0.0 alpha.33 ## Captures d'écran @@ -19,15 +19,16 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les ## Démo -* [Démo officielle](Lien vers un site de démonstration de cette application.) + * [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) ## Configuration -Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH ou tout autre moyen. + * Allez dans `domain.ltd/cp-install` pour créer un utilisateur administrateur. + * Comment configurer cette application : via le panneau d'administration `domain.ltd/cp-admin`. ## Documentation - * Documentation officielle : Lien vers la documentation officielle de cette application. + * Documentation : https://podlibre.org/create-a-podcast-in-3mn-with-castopod/ * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer. ## Caractéristiques spécifiques YunoHost @@ -44,7 +45,7 @@ Comment configurer cette application : via le panneau d'administration, un fichi ## Limitations -* Limitations connues. +* :warning: Installation possible uniquement sur un domaine racine ou sous-domaine. ## Informations additionnelles diff --git a/check_process b/check_process index d445442..ca3dd77 100755 --- a/check_process +++ b/check_process @@ -10,20 +10,21 @@ is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=d511db842c4f1c3c6043ab9293d7f4eddcd9c379 backup_restore=1 - multi_instance=0 + multi_instance=1 port_already_use=0 change_url=1 ;;; Options Email= Notification=none ;;; Upgrade options - ; commit=CommitHash + ; commit=d511db842c4f1c3c6043ab9293d7f4eddcd9c379 name=Name and date of the commit. manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/nginx.conf b/conf/nginx.conf index bd41f63..18cb0ff 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,8 +1,7 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location / { # Path to source - alias __FINALPATH__/public/ ; + alias __FINALPATH__/public/; # Force usage of https if ($scheme = http) { diff --git a/manifest.json b/manifest.json index a4f1d3f..c7716ee 100755 --- a/manifest.json +++ b/manifest.json @@ -31,17 +31,11 @@ "en": "Choose a domain name for Castopod", "fr": "Choisissez un nom de domaine pour Castopod" }, - "example": "example.com" - }, - { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path for Castopod", - "fr": "Choisissez un chemin pour Castopod" - }, - "example": "/castopod", - "default": "/castopod" + "help": { + "en": "Castopod needs to be installed in a dedicated domain or sub-domain.", + "fr": "Castopod doit être installé dans un domaine ou sous-domaine dédié." + }, + "example": "podcast.example.com" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 1125921..8eef909 100755 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH +path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -100,9 +100,9 @@ ynh_script_progression --message="Configuring Castopod..." --weight=1 cp ../conf/.env.example "$final_path/.env" # Change variables in Castopod configuration -ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$final_path/.env" -ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$final_path/.env" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="https://$domain" --target_file="$final_path/.env" +ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$final_path/.env" +ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$final_path/.env" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="https://$domain" --target_file="$final_path/.env" ynh_replace_string --match_string="__DOMAINPATH__" --replace_string="https://$domain$path_url" --target_file="$final_path/.env" #================================================= @@ -130,7 +130,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=10 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #=================================================