diff --git a/README.md b/README.md index 01b9378..2fab17d 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-hosted live video and web chat server for use with existing broadcasting software -**Shipped version:** 0.0.7~ynh1 +**Shipped version:** 0.0.8~ynh1 **Demo:** https://watch.owncast.online/ @@ -29,23 +29,22 @@ Self-hosted live video and web chat server for use with existing broadcasting so ## Configuration -You can configure Owncast in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Settings are accessible in admin page: `domain.ltd/admin` with `admin` and `your_stream_key` as credential. ## Streaming app OBS can be used as streaming video app: https://obsproject.com/ 1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. +1. Open OBS Settings and go to **Stream**. +1. Select **Custom…** as the service. 1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. +1. Enter your **Stream Key** that matches your key file. +1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. + ## Documentation and resources * Official app website: https://owncast.online/ -* Official user documentation: https://yunohost.org/apps * Official admin documentation: https://owncast.online/docs/ * Upstream app code repository: https://github.com/owncast * YunoHost documentation for this app: https://yunohost.org/app_owncast diff --git a/README_fr.md b/README_fr.md index bfa15b1..9f9cd97 100755 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion -**Version incluse :** 0.0.7~ynh1 +**Version incluse :** 0.0.8~ynh1 **Démo :** https://watch.owncast.online/ @@ -25,23 +25,22 @@ Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un lo ## Configuration -You can configure Owncast in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Les paramètres sont accessibles dans la page d'administration : : `domain.ltd/admin` avec `admin` et `votre_stream_key` comme identifiant. -## Streaming app +## Application de diffusion en continu -OBS can be used as streaming video app: https://obsproject.com/ +OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ + +1. Installez **OBS** ou **Streamlabs OBS** et faites-le fonctionner avec votre configuration locale. +1. Ouvrez les **paramètres** OBS et allez dans **Stream**. +1. Sélectionnez **Personnalisé…** comme service. +1. Entrez l'URL du serveur exécutant votre service de streaming au format `rtmp://myserver.net/live`. +1. Saisissez votre « Stream key » qui correspond à votre clé de streaming choisie lors de l'installation. +1. Appuyez sur **Démarrer le streaming** (OBS) ou **Go Live** (Streamlabs) sur OBS. -1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. -1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. ## Documentations et ressources * Site officiel de l'app : https://owncast.online/ -* Documentation officielle utilisateur : https://yunohost.org/apps * Documentation officielle de l'admin : https://owncast.online/docs/ * Dépôt de code officiel de l'app : https://github.com/owncast * Documentation YunoHost pour cette app : https://yunohost.org/app_owncast diff --git a/check_process b/check_process index 4043ed0..e628c2c 100755 --- a/check_process +++ b/check_process @@ -2,8 +2,8 @@ ; Manifest domain="domain.tld" path="/path" - admin="john" is_public=1 + password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=0 @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + upgrade=1 from_commit=4eab5026853627bed955945968753378ea41f5ad backup_restore=1 multi_instance=0 change_url=1 @@ -20,6 +20,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + ; commit=4eab5026853627bed955945968753378ea41f5ad + name= Merge pull request #1 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=1Strong-Password diff --git a/conf/arm64.src b/conf/arm64.src new file mode 100755 index 0000000..01343e6 --- /dev/null +++ b/conf/arm64.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-arm64.zip +SOURCE_SUM=f05498313a00490b60cc5df4e02d7914d8150838741577fa19b4623b2cbccbad +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=zip +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/arm7.src b/conf/arm7.src index 84fab35..936d2f9 100755 --- a/conf/arm7.src +++ b/conf/arm7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.7/owncast-0.0.7-linux-arm7.zip -SOURCE_SUM=b309205b75135ac06feff1591a24e911879f371609593dbfc510ba33d8f01c00 +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-arm7.zip +SOURCE_SUM=1e9d83d362873b0159a00c4fb38e162ffd3865ead59eedce78a5b9e7be5cfabd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/config-default.yaml b/conf/config-default.yaml deleted file mode 100644 index 854905e..0000000 --- a/conf/config-default.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# See https://owncast.online/docs/configuration/ for more details - -instanceDetails: - name: Owncast - title: Owncast - summary: "This is brief summary of whom you are or what your stream is. You can edit this description in your config file." - - logo: /img/logo.svg - - tags: - - music - - software - - streaming - - # https://owncast.online/docs/configuration/#external-links - # for full list of supported social links. All optional. - socialHandles: - - platform: github - url: http://github.com/owncast/owncast - -videoSettings: - # Change this value and keep it secure. Treat it like a password to your live stream. - streamingKey: abc123 - - streamQualities: - - medium: - videoBitrate: 1200 - encoderPreset: veryfast - -# Set to true if you don't want the service checking for future releases. -disableUpgradeChecks: false - -# Off by default. You can optionally list yourself in the Owncast directory. -# Make sure your instanceURL is the public URL to your Owncast instance. -yp: - enabled: false - instanceURL: https://__DOMAIN__ diff --git a/conf/systemd.service b/conf/systemd.service index c2726e6..5664722 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ -configFile __FINALPATH__/config.yaml +ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ Restart=on-failure RestartSec=5 diff --git a/conf/x86-64.src b/conf/x86-64.src index a526276..e57c3f9 100755 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.7/owncast-0.0.7-linux-64bit.zip -SOURCE_SUM=fee4adf4990dabefcc7486e1d6a8f474b7a477b404c5a58406936516437fbb92 +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-64bit.zip +SOURCE_SUM=e40fea62624bd76b2ea14abab10ace1f19a671795f2b0b161244ecd1f6f4c149 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 3ce0d6f..7fd8f65 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,15 +1,14 @@ ## Configuration -You can configure Owncast in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Settings are accessible in admin page: `domain.ltd/admin` with `admin` and `your_stream_key` as credential. ## Streaming app OBS can be used as streaming video app: https://obsproject.com/ 1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. +1. Open OBS Settings and go to **Stream**. +1. Select **Custom…** as the service. 1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. \ No newline at end of file +1. Enter your **Stream Key** that matches your key file. +1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100755 index 0000000..9caa78e --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,14 @@ +## Configuration + +Les paramètres sont accessibles dans la page d'administration : : `domain.ltd/admin` avec `admin` et `votre_stream_key` comme identifiant. + +## Application de diffusion en continu + +OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ + +1. Installez **OBS** ou **Streamlabs OBS** et faites-le fonctionner avec votre configuration locale. +1. Ouvrez les **paramètres** OBS et allez dans **Stream**. +1. Sélectionnez **Personnalisé…** comme service. +1. Entrez l'URL du serveur exécutant votre service de streaming au format `rtmp://myserver.net/live`. +1. Saisissez votre « Stream key » qui correspond à votre clé de streaming choisie lors de l'installation. +1. Appuyez sur **Démarrer le streaming** (OBS) ou **Go Live** (Streamlabs) sur OBS. diff --git a/manifest.json b/manifest.json index d9254fc..3e6d016 100755 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,13 @@ "en": "Self-hosted live video and web chat server for use with existing broadcasting software", "fr": "Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion" }, - "version": "0.0.7~ynh1", + "version": "0.0.8~ynh1", "url": "https://owncast.online/", "upstream": { "license": "MIT", "website": "https://owncast.online/", "demo": "https://watch.owncast.online/", "admindoc": "https://owncast.online/docs/", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/owncast" }, "license": "MIT", @@ -39,11 +38,6 @@ }, "example": "owncast.example.com" }, - { - "name": "admin", - "type": "user", - "example": "johndoe" - }, { "name": "is_public", "type": "boolean", @@ -52,6 +46,15 @@ "fr": "Si cette case est cochée, Owncast sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." }, "default": true + }, + { + "name": "password", + "type": "password", + "help": { + "en": "This is the password for connecting to the admin page as well as the Stream Key. (Only alphanumeric characters are accepted)", + "fr": "Ceci est le mot de passe pour se connecter à la page d'administration ainsi que la Stream Key. (Seuls les caractères alphanumériques sont acceptés)" + }, + "example": "Choose a password" } ] } diff --git a/scripts/_common.sh b/scripts/_common.sh index d7ea150..12eccb8 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -28,7 +28,9 @@ pkg_dependencies="ffmpeg" # Requires YunoHost version 2.2.4 or higher. ynh_detect_arch(){ local architecture - if [ -n "$(uname -m | grep 64)" ]; then + if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then + architecture="arm64" + elif [ -n "$(uname -m | grep 64)" ]; then architecture="x86-64" elif [ -n "$(uname -m | grep armv7)" ]; then architecture="arm7" diff --git a/scripts/install b/scripts/install index 663c398..2d5f820 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -admin=$YNH_APP_ARG_ADMIN +password=$YNH_APP_ARG_PASSWORD architecture=$(ynh_detect_arch) app=$YNH_APP_INSTANCE_NAME @@ -50,7 +50,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= # STANDARD MODIFICATIONS @@ -99,16 +98,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 - -ynh_add_config --template="../conf/config-default.yaml" --destination="$final_path/config.yaml" - -chmod 400 "$final_path/config.yaml" -chown $app:$app "$final_path/config.yaml" - #================================================= # NGINX CONFIGURATION #================================================= @@ -125,6 +114,15 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config +#================================================= +# SETUP APPLICATION PASSWORD +#================================================= +ynh_script_progression --message="Configuring a Stream Key..." --weight=1 + +pushd $final_path + ynh_exec_as $app $final_path/owncast -streamkey $password +popd + #================================================= # GENERIC FINALIZATION #================================================= @@ -149,8 +147,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - -sleep 30 +sleep 20 #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index b3ac6d3..a2894a7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -103,8 +103,7 @@ yunohost service add $app --description="Self-hosted live video and web chat ser ynh_script_progression --message="Starting a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - -sleep 30 +sleep 20 #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index b7141d0..c227ff8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,7 +69,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/config.yaml" + ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" fi chmod 750 "$final_path" @@ -112,7 +112,7 @@ yunohost service add $app --description="Self-hosted live video and web chat ser ynh_script_progression --message="Starting a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -sleep 30 +sleep 20 #================================================= # RELOAD NGINX