mirror of
https://github.com/YunoHost-Apps/friendica_ynh.git
synced 2024-09-03 18:36:14 +02:00
Merge branch 'master' into vFriendica_2018.05
This commit is contained in:
anmol26s
GitHub
commit
b9367916b2
5 changed files with 12 additions and 35 deletions
36
README.md
36
README.md
|
|
@ -4,13 +4,12 @@
|
|||
|
||||
|
||||
[Friendica](http://friendi.ca/) integration for YunoHost<br>
|
||||
<strong>Version:</strong>3.6<br><br>
|
||||
<strong>If you are updating from a very old version of Friendica, you have to first update to version 3.5.4(from here https://github.com/YunoHost-Apps/friendica_ynh/tree/58774643d2d8918e9eff0ba1c1ba38d2beea79ca) before you can update to the 3.6 release.</strong>
|
||||
**Version:2018.05**<br><br>
|
||||
|
||||
Current snapshot in *sources*:
|
||||
|
||||
* https://github.com/friendica/friendica: 3.6 (commit bacc5de3a229ab069db527854adbe6f1e593cd5a)
|
||||
* https://github.com/friendica/friendica-addons: 3.6 (commit dbe8118e406510d85404d9577f83d68782cfe2a0)
|
||||
* https://github.com/friendica/friendica: 2018.05 (commit 2a760bb770c015703567caa91054bcb3c9422fc0)
|
||||
* https://github.com/friendica/friendica-addons: 2018.05 (commit 97108080c26ab7b98b30e4b6c61f057314b44577)
|
||||
|
||||
## Important Notes
|
||||
|
||||
|
|
@ -25,6 +24,7 @@ Before installing, read the [Friendica installation instructions](https://github
|
|||
- [X] Ldap integration.
|
||||
- [X] Upgrade script
|
||||
- [X] Backup and restore script.
|
||||
- [X] Multi-instance
|
||||
|
||||
## Installation
|
||||
|
||||
|
|
@ -33,30 +33,6 @@ Friendica requires a dedicated domain, so obtain one and add it using the YunoHo
|
|||
|
||||
Friendica requires browser-approved SSL certificates. If you have certificates not issued by [Let's Encrypt](https://letsencrypt.org/), install them manually as usual.
|
||||
|
||||
#### YunoHost >= 2.5 :
|
||||
Once the dedicated domain has been added to YunoHost, go again to the admin panel, go to domains then select your domain and click on "Install Let's Encrypt certificate".
|
||||
|
||||
#### Yunohost < 2.5 :
|
||||
For older versions of YunoHost, once you have added the new domain, SSH into your YunoHost server and perform the following steps:
|
||||
|
||||
1. Install [certbot](https://certbot.eff.org/) to make installing free SSL certificates from Let's Encrypt simple.
|
||||
|
||||
1. Stop nginx
|
||||
|
||||
service nginx stop
|
||||
|
||||
1. Run the **certbot** utility with the **certonly** option
|
||||
|
||||
certbot certonly
|
||||
|
||||
1. Copy the generated certificate and key into the appropriate location for YunoHost to use
|
||||
|
||||
cp /etc/letsencrypt/live/YOUR_DOMAIN/fullchain.pem /etc/yunohost/certs/YOUR_DOMAIN/crt.pem
|
||||
cp /etc/letsencrypt/live/YOUR_DOMAIN/privkey.pem /etc/yunohost/certs/YOUR_DOMAIN/key.pem
|
||||
|
||||
1. Restart nginx
|
||||
|
||||
service nginx start
|
||||
|
||||
### Install the Friendica application
|
||||
Use the YunoHost admin panel to install Friendica by entering the GitHub repo address in the custom app URL
|
||||
|
|
@ -65,5 +41,5 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad
|
|||
|
||||
Make sure to select your domain from the previous section as the application domain.
|
||||
|
||||
When installation is complete, you will need to visit your new hub and login from the admin account you provided at the time of installation.You can then create your profile and access the admin panel from the button in the center of the top nav bar, just adjecent to the search bar.<b>(The admin panel don't have text,so don't get confuse) </b>
|
||||
Other users can use the Ldap authentication to be a normal user on the hub.
|
||||
After the installation,login with the username provided at the time of the installaion with your SSO password.You can then create your profile and access the admin panel from the button in the center of the top nav bar, just adjecent to the search bar.<b>(The admin panel don't have text,so don't get confuse with it) </b>
|
||||
Public users can register and use the instance as normal users. SSO users can login with there username and password as normal users too.
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
Level 1=auto
|
||||
Level 2=auto
|
||||
Level 3=auto
|
||||
# Level 4:
|
||||
Level 4=0
|
||||
# There is LDAP support for the app
|
||||
Level 4=1
|
||||
# Level 5:
|
||||
Level 5=auto
|
||||
Level 6=auto
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ ynh_add_nginx_config
|
|||
|
||||
|
||||
# configure friendica
|
||||
|
||||
sudo cp "$final_path/htconfig.php" "$final_path/.htconfig.php"
|
||||
ynh_replace_string "your.mysqlhost.com" "localhost" "$final_path/.htconfig.php"
|
||||
ynh_replace_string "mysqlusername" "$db_name" "$final_path/.htconfig.php"
|
||||
|
|
@ -155,7 +156,7 @@ sudo cp ../conf/poller-cron /etc/cron.d/$app
|
|||
ynh_store_file_checksum "$final_path/.htconfig.php"
|
||||
|
||||
# Run composer
|
||||
cd $final_path && sudo php bin/composer.phar install
|
||||
(cd $final_path && sudo php bin/composer.phar install)
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ sudo chmod -R 777 $final_path/view/smarty3
|
|||
ynh_restore_file "/etc/cron.d/$app"
|
||||
|
||||
# Run composer
|
||||
cd $final_path && sudo php bin/composer.phar install
|
||||
(cd $final_path && sudo php bin/composer.phar install)
|
||||
|
||||
# unprotected_uris allows SSO credentials to be passed anyway.
|
||||
ynh_app_setting_set $app unprotected_uris "/"
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ ynh_replace_string "__USER__" "$app" ../conf/poller-cron
|
|||
sudo cp ../conf/poller-cron /etc/cron.d/$app
|
||||
|
||||
# Run composer
|
||||
cd $final_path && sudo php bin/composer.phar install
|
||||
(cd $final_path && sudo php bin/composer.phar install)
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
|
|
|
|||
Loading…
Reference in a new issue