YunoHost-Apps/hubzilla_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hubzilla_ynh.git synced 2024-09-03 19:26:21 +02:00
Code Issues Activity Actions

Merge pull request #154 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2023-08-13 11:49:31 +02:00 • committed by GitHub
commit f7e7d44a0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication.
**Shipped version:** 8.6~ynh1 **Shipped version:** 8.6.1~ynh1
## Screenshots ## Screenshots

2
README_fr.md
View file

@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe. Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe.
**Version incluse :** 8.6~ynh1 **Version incluse :** 8.6.1~ynh1
## Captures d’écran ## Captures d’écran

9
conf/htconfig.sample.php
View file

@ -92,3 +92,12 @@ error_reporting(E_ERROR | E_WARNING | E_PARSE );
ini_set('error_log','php.log'); ini_set('error_log','php.log');
ini_set('log_errors','1'); ini_set('log_errors','1');
ini_set('display_errors', '0'); ini_set('display_errors', '0');
App::$config['system']['addon'] = 'ldapauth';
App::$config['ldapauth']['ldap_server'] = 'localhost';
App::$config['ldapauth']['ldap_searchdn'] = 'ou=users,dc=yunohost,dc=org';
App::$config['ldapauth']['ldap_userattr'] = 'uid';
App::$config['ldapauth']['ldap_autocreateaccount_emailattribute'] = 'mail';
App::$config['ldapauth']['create_account'] = '1';

7
conf/ldap_conf.php
View file

@ -1,7 +0,0 @@
App::$config['system']['addon'] = 'ldapauth';
App::$config['ldapauth']['ldap_server'] = 'localhost';
App::$config['ldapauth']['ldap_searchdn'] = 'ou=users,dc=yunohost,dc=org';
App::$config['ldapauth']['ldap_userattr'] = 'uid';
App::$config['ldapauth']['ldap_autocreateaccount_emailattribute'] = 'mail';
App::$config['ldapauth']['create_account'] = '1';

15
manifest.toml
View file

@ -5,7 +5,7 @@ name = "Hubzilla"
description.en = "Decentralized publication platform and social network" description.en = "Decentralized publication platform and social network"
description.fr = "Plateforme de publication décentralisée et un réseau social" description.fr = "Plateforme de publication décentralisée et un réseau social"
version = "8.6~ynh1" version = "8.6.1~ynh1"
maintainers = ["Anmol Sharma"] maintainers = ["Anmol Sharma"]
@ -15,7 +15,7 @@ website = "https://zotlabs.org/page/hubzilla/hubzilla-project"
code = "https://framagit.org/hubzilla/core" code = "https://framagit.org/hubzilla/core"
[integration] [integration]
yunohost = ">= 11.1.21" yunohost = ">= 11.2"
architectures = "all" architectures = "all"
multi_instance = true multi_instance = true
ldap = true ldap = true
@ -27,7 +27,6 @@ ram.runtime = "50M"
[install] [install]
[install.domain] [install.domain]
type = "domain" type = "domain"
full_domain = true
[install.admin] [install.admin]
type = "user" type = "user"
@ -42,12 +41,12 @@ ram.runtime = "50M"
[resources] [resources]
[resources.sources] [resources.sources]
[resources.sources.main] [resources.sources.main]
url = "https://framagit.org/hubzilla/core/-/archive/8.6/core-8.6.tar.gz" url = "https://framagit.org/hubzilla/core/-/archive/8.6.1/core-8.6.1.tar.gz"
sha256 = "8fc7ea5ec0f1bea8c2047f6d44612d5246b78e6a40c1ad59f88641d1fef767b8" sha256 = "16c2d5426725ad82d8bdcbfcfdc9457d14f6c636bb521b61353566101412a96e"
[resources.sources.addons] [resources.sources.addons]
url = "https://framagit.org/hubzilla/addons/-/archive/8.4.1/addons-8.4.1.tar.gz" url = "https://framagit.org/hubzilla/addons/-/archive/8.6.1/addons-8.6.1.tar.gz"
sha256 = "67f7b881f195b258c3d61922a6ce0f92832b907cafd5feb11b8abea4b2b055a0" sha256 = "6dad585ca61511043625b197c0d74e84a293c67f187bdf0d4752a5b88537d288"
[resources.system_user] [resources.system_user]
@ -57,7 +56,7 @@ ram.runtime = "50M"
main.url = "/" main.url = "/"
[resources.apt] [resources.apt]
packages = "php8.2-curl php8.2-gd php8.2-mysql php8.2-pgsql php8.2-mbstring php8.2-xml php8.2-zip php8.2-cli php8.2-imagick php8.2-json" packages = "php8.2-curl php8.2-gd php8.2-mysql php8.2-pgsql php8.2-mbstring php8.2-xml php8.2-zip php8.2-cli php8.2-imagick"
packages_from_raw_bash = """ packages_from_raw_bash = """
if [[ "$database" == "mysql" ]]; then if [[ "$database" == "mysql" ]]; then

9
scripts/install
View file

@ -36,11 +36,6 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
#================================================= #=================================================
# CREATE A DATABASE # CREATE A DATABASE
#================================================= #=================================================
#=================================================
# CREATE A MYSQL DATABASE
#=================================================
ynh_script_progression --message="Creating a database..." --weight=2 ynh_script_progression --message="Creating a database..." --weight=2
db_name=$(ynh_sanitize_dbid --db_name=$app) db_name=$(ynh_sanitize_dbid --db_name=$app)
@ -109,10 +104,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php" ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php"
# addon ldap config
ynh_script_progression --message="Push LDAP configuration to .htconfig.php..."
cat ../conf/ldap_conf.php >> $install_dir/.htconfig.php
ynh_store_file_checksum --file=$install_dir/.htconfig.php ynh_store_file_checksum --file=$install_dir/.htconfig.php
chmod 600 "$install_dir/.htconfig.php" chmod 600 "$install_dir/.htconfig.php"

38
scripts/upgrade
View file

@ -93,31 +93,27 @@ ynh_add_nginx_config
#================================================= #=================================================
# UPDATE A CONFIG FILE # UPDATE A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." --weight=1 # ynh_script_progression --message="Updating a configuration file..." --weight=1
if [ $database = "mysql" ]; then # if [ $database = "mysql" ]; then
db_type=0 # db_type=0
db_name=$(ynh_sanitize_dbid --db_name=$app) # db_name=$(ynh_sanitize_dbid --db_name=$app)
db_user=$db_name # db_user=$db_name
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) # db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
# Change your databases character set and collation # # Change your databases character set and collation
ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ # ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
<<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" # <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
elif [ $database = "postgresql" ]; then # elif [ $database = "postgresql" ]; then
db_type=1 # db_type=1
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) # db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
fi # fi
ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php" # ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php"
# addon ldap config # ynh_store_file_checksum --file=$install_dir/.htconfig.php
ynh_script_progression --message="Push LDAP configuration to .htconfig.php..."
cat ../conf/ldap_conf.php >> $install_dir/.htconfig.php # chmod 600 "$install_dir/.htconfig.php"
ynh_store_file_checksum --file=$install_dir/.htconfig.php # chown $app:$app "$install_dir/.htconfig.php"
chmod 600 "$install_dir/.htconfig.php"
chown $app:$app "$install_dir/.htconfig.php"
#================================================= #=================================================
# UPGRADE CRON JOB # UPGRADE CRON JOB