Skip to content

Commit

Permalink
- use localhost for ynh domain config (thanks n00dl3)
Browse files Browse the repository at this point in the history
- update README
  • Loading branch information
Djip007 committed Dec 2, 2015
1 parent 242bde4 commit cef2672
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rainloop for YunoHost

* [rainloop](http://rainloop.net/ )
* [rainloop](http://rainloop.net/ ): 1.9.3.365

## English
Rainloop is a lightweight webmail.
Expand All @@ -16,7 +16,7 @@ https://DOMAIN.TLD/baikal/card.php/addressbooks/USER/default/

- to upgrade the app once a new rainloop version is available, simply run in a local shell via ssh or otherwise :

``sudo yunohost app upgrade -u https://github.com/polytan02/rainloop_ynh rainloop``
``sudo yunohost app upgrade -u https://github.com/YunoHostPlugins-Testing/rainloop_ynh rainloop``


## Français
Expand All @@ -34,5 +34,5 @@ https://DOMAIN.TLD/baikal/card.php/addressbooks/UTILISATEUR/default/

- pour mettre à jour rainloop lorsqu'une nouvelle version est disponible, lancez en console locale (ssh ou autre) :

``sudo yunohost app upgrade -u https://github.com/polytan02/rainloop_ynh rainloop``
``sudo yunohost app upgrade -u https://github.com/YunoHostPlugins-Testing/rainloop_ynh rainloop``

4 changes: 2 additions & 2 deletions conf/data/domains/domain.tld.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
imap_host = "domain.tld"
imap_host = "localhost"
imap_port = 993
imap_secure = "SSL"
imap_short_login = On
Expand All @@ -7,7 +7,7 @@ sieve_allow_raw = Off
sieve_host = ""
sieve_port = 4190
sieve_secure = "None"
smtp_host = "domain.tld"
smtp_host = "localhost"
smtp_port = 465
smtp_secure = "SSL"
smtp_short_login = On
Expand Down
4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"url": "http://rainloop.net/",
"maintainer": {
"name": "polytan02",
"email": "polytan02@mcgva.org"
"name": "scith, Djip007",
"email": "none@domaine.org"
},
"multi_instance": "false",
"arguments": {
Expand Down
12 changes: 8 additions & 4 deletions scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,20 @@ app=rainloop
exit 1
fi

# Generate random password, use 'rainloop' as database name and user and intialize databse
# Generate random password
db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')

# Use 'rainloop' as database name and user
db_user=$app

# Initialize database and store mysql password for upgrade
sudo yunohost app initdb $db_user -p $db_pwd
sudo yunohost app setting $app mysqlpwd -v $db_pwd

# Create the final path and copy sources
final_path=/var/www/$app
rainloop_path=${final_path}/app
#rainloop_path=${final_path}

sudo rm -rf $final_path
sudo mkdir -p $final_path
Expand Down Expand Up @@ -80,9 +85,8 @@ app=rainloop

# get list of ldap domains
alldomains=`ldapsearch -LLL -x -b ou=domains,dc=yunohost,dc=org -s one "objectclass=top" virtualdomain | grep -v "dn:" | sed "s/virtualdomain://" `
for alldomain in $alldomains ; do
sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$alldomain.ini
sudo sed -i "[email protected]@$alldomain@g" $rainloop_path/data/_data_/_default_/domains/$alldomain.ini
for domain in $alldomains ; do
sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$domain.ini
done
sudo cp ../conf/data/domains/disabled $rainloop_path/data/_data_/_default_/domains/disabled

Expand Down

0 comments on commit cef2672

Please sign in to comment.