Commit Graph

3034 Commits

Author SHA1 Message Date
Benjamin Sonntag f930bde36d adding all patched from squeeze to wheezy then jessie. 2018-06-21 17:29:42 +02:00
cam.lafit 3525041839 No more need to package alternc-ssl
* Say good bye, thank a lot
2018-06-21 17:26:27 +02:00
cam.lafit c8d94d2a50 SSL massive backport
* Now we integrate all alternc-feature in native alternc
* Files are backported as waiting by alternc
* Some files was renammed or moved to follow alternc installation
process
2018-06-21 17:26:27 +02:00
cam.lafit bd53247eaf Backport SSL functionality in alternc
* First step stop alternc-ssl support
2018-06-21 17:26:27 +02:00
Jonathan Demmerlé 4d8d2c1c39
some fixes
@media (max-width: is ugly, but well, better than nothing.
2018-06-21 10:25:41 +02:00
Kienan Stewart cc184aa148 Merge branch '233-opendkim_broken_following_installation' into pu 2018-06-14 15:00:22 -04:00
Kienan Stewart d7836e3928 Fix sed invocation to it runs in-place 2018-06-14 15:00:09 -04:00
Kienan Stewart a4dcedeb5d Merge branch '233-opendkim_broken_following_installation' into pu 2018-06-14 14:14:44 -04:00
Kienan Stewart e040c3ad6a Generate opendkim configuration in stretch when alternc.install is run
The default configuration in stretch doesn't work very well and
needs a couple of tweaks. This will generate the service files and
make sure opendkim is run as the opendkim user instead of root.

The alternc opendkim.conf template is updated so that the connection
can be made locally through a socket.
2018-06-14 14:12:14 -04:00
Kienan Stewart 3f94e81e44 Merge branch '247_escape-mysql-passwords-at-install' into pu 2018-06-14 13:26:57 -04:00
Kienan Stewart 5a4f924088 Properly escape passwords in template sed script
Previous changes were made to the wrong place
2018-06-14 13:25:57 -04:00
Kienan Stewart ea9ecfcd50 Merge branch '254-cannot_create_default_domains' into pu 2018-06-14 10:51:28 -04:00
Kienan Stewart ce80e3cdad Fix #254: Creating default domains for new members fails
A typo caused the check to see if domain delegation was allowed to
always fail.
2018-06-14 10:50:28 -04:00
Kienan Stewart e9da389e85 Merge branch '247_escape-mysql-passwords-at-install' into pu 2018-06-13 18:04:25 -04:00
Kienan Stewart 1b08ae2638 use string templating instead of sed for creating/updating mysql configuration during install 2018-06-13 18:02:10 -04:00
Kienan Stewart eca8d7ccdf Escape mysql passwords in alternc install 2018-06-13 18:01:43 -04:00
Kienan Stewart c300912d78 Merge branch '221_cannot_manage_subdomain' into pu 2018-06-12 21:17:05 -04:00
Kienan Stewart 9c1e7cccd0 Get sub_domain_id and status from get instead of post in dom_substatus
The submission is done through links with get parameters (see dom_edit.php)
2018-06-12 21:11:14 -04:00
Kienan Stewart bc676f8b50 Merge apache2 configuration from branch '230-rebase-to-stretch' into pu 2018-06-12 19:36:32 -04:00
Kienan Stewart ed3401404f Cherrypick apache2 configuration for jessie/stretch
Sourced from ea3371ae34
2018-06-12 19:35:14 -04:00
Kienan Stewart d5e07b6a67 Merge branch '245-fix_warning_when_setting_files_unwritable' into pu 2018-06-08 15:10:41 -04:00
Kienan Stewart 83d03b8ee7 Fix #245: Files default to unwritable when permissions are changed in the file browser 2018-06-08 15:10:26 -04:00
Kienan Stewart 44e3cb0833 Merge branch '243-fix_undefined_variable_domaine_name' into pu 2018-06-08 14:33:18 -04:00
Kienan Stewart f39e72d58a Fixes #243: Fix typo in domain_name variable 2018-06-08 14:32:01 -04:00
Kienan Stewart 325b913e24 Merge remote-tracking branch 'koumbit/stable-3.1' into pu 2018-06-07 13:22:42 -04:00
Benjamin Sonntag 71ed8bf5f4 [fix] wrong field name in account creation in MySQL 2018-06-05 08:41:59 +02:00
Benjamin Sonntag f5e525d8ad fixing badly indexed messages in awstats reporting 2018-05-22 16:57:04 +02:00
Kienan Stewart cfa43ac3d6 Merge branch '222-alternc_ssl_mysql_connect_not_found' into pu 2018-05-17 17:59:12 -04:00
Kienan Stewart 1c910f4448 Remove trailing spaces / tabs from quota_init 2018-05-17 17:58:38 -04:00
Kienan Stewart be8edc140d Include connection parameter when calling mysqli_query 2018-05-17 17:57:32 -04:00
Kienan Stewart 63305a1ef5 Merge branch 'broken-symlinks' into pu 2018-05-17 17:33:00 -04:00
Kienan Stewart 8acc5d833b Fix broken symlinks for ssl locales 2018-05-17 17:32:01 -04:00
Kienan Stewart 529bf3bd45 Merge branch '230-rebase-to-stretch' into pu 2018-05-17 15:22:17 -04:00
Kienan Stewart 29a213cc26 Change function calls from mysql_* to mysqli_*
Sourced from: https://raw.githubusercontent.com/soul9/AlternC/470ed9cd1535461c7a809ce6c8d55919b76f14a0/stretch/quota_init.diff

@see https://github.com/AlternC/AlternC/issues/222
2018-05-17 15:15:56 -04:00
Dominique Rousseau 41278cc72a correct wrong owner for roundcube temp_dir /var/lib/roundcube/temp 2018-05-14 10:03:08 +02:00
Steven Mondji-Lerider 0385a933f7 Fixes : #1480
(cherry picked from commit af974c7b83)
2018-05-14 09:59:36 +02:00
azerttyu 177d76bd85 Revert "adding sync-unix-accounts.php, synchronize unix accounts with AlternC ones. not enabled by default, not even installed yet"
* We revert this commit as it's provided by an AlternC plugin
* Report to https://github.com/alternc/alternc-nss to get more informations

Note : This reverts commit 240a7738fc.
2018-04-30 10:47:12 +02:00
Kienan Stewart 88f3457191 Use sha512 crypt to store ftp password hashes 2018-04-16 22:46:05 -04:00
Kienan Stewart 56cbd2f8b4 Move the sha512 crypt hash into it's own function 2018-04-16 22:35:41 -04:00
Kienan Stewart 294397e10f Merge branch 'issue-227-dovecot_password' into issue-227-password_hashes 2018-04-16 22:27:19 -04:00
Kienan Stewart 00c1d55406 Generate SHA512-CRYPT hashes for e-mail addresses 2018-04-16 21:02:45 -04:00
Kienan Stewart a609984d39 Fix invocations of password_hash() 2018-04-15 22:00:16 -04:00
Kienan Stewart 60ce1fd1df Use phpunit from composer download 2018-04-15 21:45:18 -04:00
Kienan Stewart 5597184a37 Fix error in composer call in before_sscript 2018-04-15 21:39:21 -04:00
Kienan Stewart 7b231d1635 Test changes to travis.yml 2018-04-15 21:37:37 -04:00
Kienan Stewart eb588cc0c3 Get phpunit/dbunit from composer for travis tests 2018-04-15 21:27:41 -04:00
Kienan Stewart 367b653d07 Some fixes to the PHPUnit tests 2018-04-15 21:23:24 -04:00
Kienan Stewart fce764a8ad Add php5.6 and php7.0 versions for tests 2018-04-15 20:12:50 -04:00
Kienan Stewart d24aabdafd Remove test references to the m_variables class 2018-04-15 20:10:27 -04:00
Kienan Stewart 971e38778f Update stored password hash on user login.
If an md5 hash is stored, a new hash will be calculated and stored.
2018-04-15 19:03:57 -04:00