1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/osjs_ynh.git synced 2024-09-03 19:56:11 +02:00

Merge pull request #20 from YunoHost-Apps/testing

fix-upgrade
This commit is contained in:
yalh76 2022-03-30 01:52:12 +02:00 committed by GitHub
commit 4cbe7e9546
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 34 deletions

View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
[OS.js](https://www.os-js.org/) is an [open-source](https://raw.githubusercontent.com/os-js/OS.js/master/LICENSE) web desktop platform with a window manager, application APIs, GUI toolkit, filesystem abstractions and much more.
**Shipped version:** 3.1.12~ynh1
**Shipped version:** 3.1.12~ynh2
**Demo:** https://demo.os-js.org/

View file

@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
[OS.js](https://www.os-js.org/) is an [open-source](https://raw.githubusercontent.com/os-js/OS.js/master/LICENSE) web desktop platform with a window manager, application APIs, GUI toolkit, filesystem abstractions and much more.
**Version incluse :** 3.1.12~ynh1
**Version incluse :** 3.1.12~ynh2
**Démo :** https://demo.os-js.org/

View file

@ -13,7 +13,8 @@
setup_private=1
setup_public=1
upgrade=1
"upgrade=1 from_commit=CommitHash
# 3.1.12~ynh1
upgrade=1 from_commit=5b84e38190212d2f557c4d65d88f376e93e7d242
backup_restore=1
multi_instance=1
port_already_use=0

View file

@ -6,7 +6,7 @@
"en": "Desktop you have accesss through your browser",
"fr": "Bureau accessible à travers votre navigateur"
},
"version": "3.1.12~ynh1",
"version": "3.1.12~ynh2",
"url": "https://www.os-js.org/",
"upstream": {
"license": "MIT",

View file

@ -140,36 +140,6 @@ pushd $final_path
npm install --save --production @osjs/pam-auth
popd
#=================================================
# Add Authentication through Mysql Database
#=================================================
#pushd $final_path
#$ynh_npm install --save --production @osjs/database-auth
#$ynh_npm install --save mysql
#$ynh_node osjs config:set --name=authenticator --value=database
#$ynh_node osjs config:set --name=server.modules.auth.database.driver --value=mysql
#$ynh_node osjs config:set --name=server.modules.auth.database.mysql.host --value=localhost
#$ynh_node osjs config:set --name=server.modules.auth.database.mysql.user --value=$db_name
#$ynh_node osjs config:set --name=server.modules.auth.database.mysql.password --value=$db_pwd
#$ynh_node osjs config:set --name=server.modules.auth.database.mysql.database --value=$db_name
#$ynh_node osjs config:set --name=client.ReloadOnShutdown --value=true
#popd
#$ynh_node osjs build:config
#=================================================
# Add the first user
#=================================================
##$ynh_node bin/add-user.js add $admin_name admin
#$ynh_node bin/add-user.js pwd $admin_name <<< $admin_pass
#mkdir vfs/home/$admin_name
#=================================================
# Configure init script
#=================================================
ynh_replace_string --match_string="8000" --replace_string="$port" --target_file="$final_path/src/server/config.js"
chown -R $app:$app "$final_path"

View file

@ -106,6 +106,21 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
#=================================================
# SPECIFIC UPGRADE
#=================================================
# UPDATE A CONFIG FILE
#=================================================
ynh_script_progression --message="Updating a configuration file..."
ynh_add_config --template="../conf/client.config.js" --destination="$final_path/src/client/config.js"
chmod 400 "$final_path/src/client/config.js"
chown $app:$app "$final_path/src/client/config.js"
ynh_add_config --template="../conf/server.index.js" --destination="$final_path/src/server/index.js"
chmod 400 "$final_path/src/server/index.js"
chown $app:$app "$final_path/src/server/index.js"
#=================================================
# BUILD APP
#=================================================
@ -119,6 +134,10 @@ pushd $final_path
npm install --save --production @osjs/pam-auth
popd
ynh_replace_string --match_string="8000" --replace_string="$port" --target_file="$final_path/src/server/config.js"
chown -R $app:$app "$final_path"
#=================================================
# SETUP SYSTEMD
#=================================================