diff --git a/README.md b/README.md index 469b688..af03fc4 100644 --- a/README.md +++ b/README.md @@ -29,13 +29,18 @@ Armadietto is maintained by the remoteStorage community, ([IRC](https://web.libe **Shipped version:** 0.1.5 +### Installation option + +User registration is not allowed out of the box. +This option can be enabled in the configuration panel. + ### Application for remoteStorage -[Click here](https://remotestorage.io/apps/) to see the list of applications that can be used with RemoteStorage. +[Here](https://remotestorage.io/apps/) is a non-exhaustive list of apps that have integrated remoteStorage as a storage/sync option. -**Shipped version:** 0.0.2~ynh6 +**Shipped version:** 0.0.5~ynh1 diff --git a/README_fr.md b/README_fr.md index dc31b55..43cffee 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,11 +25,16 @@ Armadietto est maintenu par la communauté remoteStorage, ([IRC](https://web.lib **Version livrée:** 0.1.5 +### Option d'installation + +L'inscription des utilisateurs n'est pas autorisée par défault. +Cette option peut être activée via le panneau de configutration. + ### Application pour remoteStorage -[Cliquez ici](https://remotestorage.io/apps/) pour voir la liste des applications qui peuvent être utilisées avec RemoteStorage. +[Cliquez ici](https://remotestorage.io/apps/) pour voir une liste non exhaustive d'applications ayant intégré remoteStorage comme option de stockage/synchronisation. -**Version incluse :** 0.0.2~ynh6 +**Version incluse :** 0.0.5~ynh1 diff --git a/actions.toml b/actions.toml new file mode 100644 index 0000000..1a1d7f4 --- /dev/null +++ b/actions.toml @@ -0,0 +1,25 @@ +[is_signup] +name = "Signup activation" +description = "Allow visitors to register and create an account?" +command = "/bin/bash scripts/actions/is_signup" +accepted_return_codes = [0] + + # [is_signup.arguments] + # [is_signup.arguments.is_signup] + # type = "boolean" + # ask.en = "Allow signup?" + # # default = false + + +[public_private] +name = "Private / Public" +description = "TODO" +command = "/bin/bash scripts/actions/public_private" +accepted_return_codes = [0] + + + [public_private.arguments] + [public_private.arguments.is_public] + type = "boolean" + ask.en = "Is it a public app?" + default = true diff --git a/check_process b/check_process index 9444bd9..b6eb2da 100644 --- a/check_process +++ b/check_process @@ -10,26 +10,22 @@ admin="armadietto" language="fr" is_public=1 - is_signup=true + is_signup=0 port="8008" ; Checks pkg_linter=1 - setup_sub_dir=0 setup_root=1 - setup_nourl=0 setup_private=1 setup_public=1 upgrade=1 # 0.0.2~ynh5 upgrade=1 from_commit=d185b84698a9f7e83eff6bf6dd5606f35282a536 backup_restore=1 - multi_instance=0 - port_already_use=0 change_url=1 ;;; Options Email= Notification=none ;;; Upgrade options ; commit=d185b84698a9f7e83eff6bf6dd5606f35282a536 - name= Upgrade to version 0.0.2~ynh6 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&is_signup=true&port=8008& + name= Upgrade from version 0.0.2~ynh6 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&is_signup=0&port=8008& diff --git a/conf/config.sample.yml b/conf/config.sample.yml deleted file mode 100644 index 94a2890..0000000 --- a/conf/config.sample.yml +++ /dev/null @@ -1,11 +0,0 @@ -#================================================= -# ARMADIETTO CONFIGURATION -#================================================= - - -final_path: __FINALPATH__ -datadir: __DATADIR__ -port: __PORT__ -domain: __DOMAIN__ -is_signup: __IS_SIGNUP__ - diff --git a/conf/systemd.service b/conf/systemd.service index 5fc0dcf..9ced78c 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -6,8 +6,8 @@ After=network.target Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=__FINALPATH__/ -ExecStart=__YNH_NODE__ __FINALPATH__/server +WorkingDirectory=__FINAL_PATH__/ +ExecStart=__YNH_NODE__ __FINAL_PATH__/server Restart=always Environment=__YNH_NODE_LOAD_PATH__ Environment=NODE_ENV=production diff --git a/config_panel.toml b/config_panel.toml index d703689..989695b 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,16 +1,15 @@ version = "1.0" -name= "Armadietto configuration panel" [main] -name = "Armadietto signup configuration" +name = "Settings" - [main.is_signup] - name = "Signup configuration" + [main.global_config] + name = "Access options" - [main.is_signup.signup] - ask.en = "Allow signups?" - ask.fr = "Accepter les inscriptions ?" + services = ["nginx", "__APP__"] + + [main.global_config.is_signup] + ask = "Allow signups?" type = "boolean" - default = true - help.en = "Would you like to allow visitors to register and create an account?" - help.fr = "Souhaitez-vous autoriser les visiteurs à s'inscrire et créer un compte ?" + help = "Would you like to allow visitors to register and create an account?" + bind = "signup:__FINALPATH__/server.js" diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 2f61dd5..d5dea9d 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -12,7 +12,12 @@ Armadietto is maintained by the remoteStorage community, ([IRC](https://web.libe **Shipped version:** 0.1.5 +### Installation option + +User registration is not allowed out of the box. +This option can be enabled in the configuration panel. + ### Application for remoteStorage -[Click here](https://remotestorage.io/apps/) to see the list of applications that can be used with RemoteStorage. +[Here](https://remotestorage.io/apps/) is a non-exhaustive list of apps that have integrated remoteStorage as a storage/sync option. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 0a88b55..a5fc1f9 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -12,6 +12,11 @@ Armadietto est maintenu par la communauté remoteStorage, ([IRC](https://web.lib **Version livrée:** 0.1.5 +### Option d'installation + +L'inscription des utilisateurs n'est pas autorisée par défault. +Cette option peut être activée via le panneau de configutration. + ### Application pour remoteStorage -[Cliquez ici](https://remotestorage.io/apps/) pour voir la liste des applications qui peuvent être utilisées avec RemoteStorage. \ No newline at end of file +[Cliquez ici](https://remotestorage.io/apps/) pour voir une liste non exhaustive d'applications ayant intégré remoteStorage comme option de stockage/synchronisation. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b8a72c2..e44b456 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A remoteStorage server running as a nodejs web service with systemd", "fr": "Un serveur remoteStorage excécuté en tant que service web nodejs par systemd" }, - "version": "0.0.2~ynh6", + "version": "0.0.5~ynh1", "url": "https://github.com/remotestorage/armadietto", "upstream": { "license": "MIT", @@ -40,19 +40,6 @@ "en": "Would you like to restrein the access to this web site?", "fr": "Souhaitez-vous limiter l'accès à ce site web ?" } - }, - { - "name": "is_signup", - "type": "boolean", - "ask": { - "en": "Allow signups?", - "fr": "Accepter les inscriptions ?" - }, - "help": { - "en": "Would you like to allow visitors to register and create an account?", - "fr": "Souhaitez-vous autoriser les visiteurs à s'inscrire et créer un compte ?" - }, - "default": true } ] } diff --git a/scripts/install b/scripts/install index ec6491c..44c30c5 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 -is_signup=$YNH_APP_ARG_IS_SIGNUP +is_signup="0" app=$YNH_APP_INSTANCE_NAME @@ -106,10 +106,10 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.sample.yml" --destination="$final_path/config.yml" +# ynh_add_config --template="../conf/config.yml" --destination="$final_path/config.yml" -chmod 400 "$final_path/config.yml" -chown $app:$app "$final_path/config.yml" +# chmod 400 "$final_path/config.yml" +# chown $app:$app "$final_path/config.yml" #================================================= # SETUP SYSTEMD diff --git a/scripts/upgrade b/scripts/upgrade index cf847ee..1cc662f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,8 +93,6 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Setting up and create final app path..." --weight=1 ynh_app_setting_set $app final_path $final_path -# Download, check integrity, uncompress and patch the source from app.src -# ynh_setup_source --dest_dir="$final_path" # Create final_path mkdir -p "$final_path" @@ -114,10 +112,10 @@ ynh_use_nodejs #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=2 -ynh_add_config --template="../conf/config.sample.yml" --destination="$final_path/config.yml" +# ynh_add_config --template="../conf/config.yml" --destination="$final_path/config.yml" -chmod 400 "$final_path/config.yml" -chown $app:$app "$final_path/config.yml" +# chmod 400 "$final_path/config.yml" +# chown $app:$app "$final_path/config.yml" #================================================= # CREATE DATA DIRECTORY @@ -162,10 +160,10 @@ fi #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=2 -ynh_add_config --template="../conf/config.sample.yml" --destination="$final_path/config.yml" +# ynh_add_config --template="../conf/config.yml" --destination="$final_path/config.yml" -chmod 400 "$final_path/config.yml" -chown $app:$app "$final_path/config.yml" +# chmod 400 "$final_path/config.yml" +# chown $app:$app "$final_path/config.yml" ### Same as during install ###