maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Commit Graph

  • cf8fbe2224 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2016-02-28 22:07:04 +01:00
  • 573fd69c95 avoid unknown variable if there are no domains in domain-list Michael Kaufmann (d00p) 2016-02-28 22:04:57 +01:00
  • 71f502f508 Merge pull request #325 from Churro/froxlorMerge_proftpd Michael Kaufmann 2016-02-28 09:12:54 +01:00
  • f4a9152d8f Added TLS by default for Gentoo Johannes Feichtner 2016-02-27 21:03:14 +01:00
  • 319668d384 Merge pull request #326 from Churro/froxlorMerge_vhostTemplates Michael Kaufmann 2016-02-27 20:43:10 +01:00
  • 101e791add Vhost templates: Extended the cron scripts to check for the designated webserver and referential integrity Johannes Feichtner 2016-02-27 20:19:50 +01:00
  • 088eef9728 Vhost templates: Added a field to select the target webserver Johannes Feichtner 2016-02-27 20:18:16 +01:00
  • aa592c7369 re-arrange menu-entries to be better categorized Michael Kaufmann (d00p) 2016-02-27 20:03:26 +01:00
  • b67749bcdc allow private networks in AXFR server list Michael Kaufmann (d00p) 2016-02-27 20:02:46 +01:00
  • b05105bfdf fix specialsettingsforsubdomains if security questions are being asked when editing a domain, fixes #1598 Michael Kaufmann (d00p) 2016-02-27 19:57:29 +01:00
  • 6a10020e9b respect 'start_servers value must not be greater than max_spare_servers' correctly, thx to Ragnos for the info Michael Kaufmann (d00p) 2016-02-27 18:52:14 +01:00
  • 9f85074876 Merge pull request #324 from Churro/froxlorMerge_autoresize Roman Schmerold 2016-02-27 14:37:05 +01:00
  • 45bf41db4c ProFTPD: enable TLS by default. Fixes #1522 Johannes Feichtner 2016-02-27 14:22:23 +01:00
  • 06f4907053 Added autoresize to shell commands Johannes Feichtner 2016-02-27 13:17:39 +01:00
  • 4f2ee129fd Merge pull request #318 from Churro/froxlorMerge_33ab67a Michael Kaufmann 2016-02-26 19:16:49 +01:00
  • 373cb912d8 - Hide the option on whether to include default directives with webservers different than nginx - Typo fix - Indentation fix Johannes Feichtner 2016-02-26 19:08:08 +01:00
  • f284d67843 Merge pull request #323 from Churro/froxlorMerge_autoupdate Michael Kaufmann 2016-02-23 22:53:58 +01:00
  • 75172f9e8d Fix autoupdate against HTTP MITM and MD5 collisions Johannes Feichtner 2016-02-23 21:52:35 +01:00
  • 48a1b9489a Copyright fixed Johannes Feichtner 2016-02-23 21:04:43 +01:00
  • 2e0cb5050f Merge pull request #322 from WebsiteDeveloper/1585 Michael Kaufmann 2016-02-23 17:05:29 +01:00
  • 6ddbb10b5a Fix #1585 Bernhard Sirlinger 2016-02-23 16:28:58 +01:00
  • 802e12cf7b Merge pull request #321 from nachtgeist/master Michael Kaufmann 2016-02-22 15:41:02 +01:00
  • 82b43948b4 cron/apache Daniel Reichelt 2016-02-22 15:31:23 +01:00
  • 36cf003ed6 Fixed LE - alias for nginx in other distributions as well Florian Aders 2016-02-22 12:22:08 +01:00
  • 2286ea751e Merge pull request #320 from guruevi/master Florian Aders 2016-02-22 12:14:12 +01:00
  • deb19f2625 Removed unnecessary exit - calls Florian Aders 2016-02-22 12:10:06 +01:00
  • 83fd1ab0ca class.lescript.php: OpenSSL requires integer for key size. DB returns string. Cast string to integer trusty.xml: All files in conf.d get automatically included causing the location to be out of place and nginx fails to start cron_tasks.inc.http.30.nginx.php: Location directives should be included in a host, nginx doesn't have the concept of global location directives in the way apache does Evi Vanoost 2016-02-21 18:55:02 -05:00
  • f00a1ca092 Merge pull request #319 from stweil/fix Michael Kaufmann 2016-02-21 19:45:01 +01:00
  • 152b407cb7 Add missing function argument Stefan Weil 2016-02-21 19:05:50 +01:00
  • 5c5e736776 Order vhost and php settings ascending by domain Johannes Feichtner 2016-02-12 10:16:33 +01:00
  • dc71a582fc Enable standard directives by default Johannes Feichtner 2016-02-12 10:14:24 +01:00
  • fc92e2655c display update-status the way we always do them; fix language strings for new multiple-default-ips Michael Kaufmann (d00p) 2016-02-21 14:53:50 +01:00
  • abe253bc31 Feature: Vhost templates Johannes Feichtner 2016-02-11 23:21:43 +01:00
  • 0559f3c4d6 Merge pull request #317 from Churro/froxlorMerge_0218b5a Michael Kaufmann 2016-02-21 14:35:19 +01:00
  • ae2bad5ab4 Declare prepared statement only once Johannes Feichtner 2016-02-21 14:20:30 +01:00
  • 55df79a79c Fix for previous commit: Also delete occasionally existing entries for the newly defined standard IP entries before re-adding them. They could have been assigned separately Johannes Feichtner 2016-02-10 00:55:33 +01:00
  • 32c32a7e7a Enable multiple standard IPs Johannes Feichtner 2016-02-10 00:21:07 +01:00
  • d7ca3a0f1c Merge pull request #303 from Churro/froxlorMerge Michael Kaufmann 2016-02-21 13:09:29 +01:00
  • e8489e55a1 Merge pull request #304 from Churro/froxlorMerge_f437f92 Michael Kaufmann 2016-02-21 08:18:44 +01:00
  • 5c90c3aa97 Merge pull request #315 from Churro/froxlorMerge_d02a076 Michael Kaufmann 2016-02-21 08:09:06 +01:00
  • b5e739620d Merge pull request #310 from Churro/froxlorMerge_fe8093f Michael Kaufmann 2016-02-21 08:07:58 +01:00
  • a328a95c01 Set default curve to secp384r1 Johannes Feichtner 2016-02-08 23:23:56 +01:00
  • 11b3ac67b0 Merge pull request #311 from Churro/froxlorMerge_c5cf2fa Michael Kaufmann 2016-02-20 22:20:45 +01:00
  • b8e7122452 Merge pull request #309 from Churro/froxlorMerge_a036bfb Michael Kaufmann 2016-02-20 22:20:23 +01:00
  • a6bd323a0e Merge pull request #314 from Churro/froxlorMerge_ce6cc23 Michael Kaufmann 2016-02-20 22:17:49 +01:00
  • 4bec449a26 Merge pull request #313 from Churro/froxlorMerge_8265df4 Michael Kaufmann 2016-02-20 22:16:41 +01:00
  • 2176482e4f Merge pull request #312 from Churro/froxlorMerge_typos Dessa 2016-02-20 21:59:18 +01:00
  • 9c7092292b Feature: Make the MYSQL_PASSWORD string definable once in order to be able to copy the fragments without further change Johannes Feichtner 2016-02-10 14:27:20 +01:00
  • 46eeb65ff0 IPs and Ports: Only show attributes used by the current webserver Johannes Feichtner 2016-02-15 22:37:46 +01:00
  • dd79a3a78a German typo fix Johannes Feichtner 2016-02-15 20:42:29 +01:00
  • fef9e51c9a Capitalization fixed Johannes Feichtner 2016-02-14 18:26:59 +01:00
  • c27589e8c2 Set correct error log levels (LOG_ERR instead of LOG_ERROR) Johannes Feichtner 2016-02-13 15:53:00 +01:00
  • 1ace011ad2 Nginx: Avoid multiple index directives (common pitfall) Johannes Feichtner 2015-11-16 22:53:03 +01:00
  • c269a3d363 Merge pull request #308 from Churro/froxlorMerge_bca75e9 Dessa 2016-02-20 20:22:21 +01:00
  • 387be846f1 Fix fatal error in phpErrHandler with PHP7 and suit cronjob for various PHP versions Johannes Feichtner 2015-11-06 23:39:56 +01:00
  • a788660efe .gitignore update for Idea files Johannes Feichtner 2015-12-05 00:22:05 +01:00
  • 73c8643218 Merge pull request #306 from Churro/froxlorMerge_4aeb06e Michael Kaufmann 2016-02-20 19:50:37 +01:00
  • cd7b65395f Merge pull request #305 from Churro/froxlorMerge_6622deb Michael Kaufmann 2016-02-20 19:46:28 +01:00
  • 1c467d71c7 Changed fastcgi IPC dir to a path that is definitely existing Johannes Feichtner 2015-11-07 00:29:15 +01:00
  • a641dfbfc8 Security-critical fix: Nginx directory protection did not prevent access to PHP scripts Johannes Feichtner 2015-09-16 00:42:11 +02:00
  • 268b188133 Apache 2.4: Add AllowOVerride All, otherwise Apache ignores .htaccess files Johannes Feichtner 2015-09-15 23:17:43 +02:00
  • 4692d7ef2a Nginx: Changed inefficient RegEx redirect to equivalent 301 Johannes Feichtner 2015-09-20 15:23:20 +02:00
  • 3b9201fb91 Nginx: Fix for redundantly inserted auth blocks Johannes Feichtner 2015-09-15 23:33:40 +02:00
  • 6e0f18b200 Merge pull request #301 from Churro/froxlorMerge Michael Kaufmann 2016-02-20 17:17:41 +01:00
  • dfee6873da Merge pull request #302 from stweil/typo Michael Kaufmann 2016-02-20 17:17:21 +01:00
  • 50e7311390 Fix some typos in code comments Stefan Weil 2016-02-16 21:56:32 +01:00
  • 1c4b88d014 Fix for case insensitivity bug in Apache 2.4.12 + PHP-FPM Johannes Feichtner 2015-09-15 23:07:02 +02:00
  • 0935a9c193 Merge pull request #300 from Froxlor/revert-299-master Michael Kaufmann 2016-02-20 15:25:47 +01:00
  • 8a99bd1d51 Revert "Changes in the config templates" Michael Kaufmann 2016-02-20 15:24:51 +01:00
  • be1a12821e Merge pull request #299 from ianklemm/master Michael Kaufmann 2016-02-20 15:21:37 +01:00
  • bc9bc84f23 Update gentoo.xml Vengance 2016-02-20 14:27:53 +01:00
  • e5bb58cd91 Update wheezy.xml Vengance 2016-02-20 14:24:35 +01:00
  • 074b425ee0 Update precise.xml Vengance 2016-02-20 14:23:29 +01:00
  • 59e599a952 Update rhel_centos.xml Vengance 2016-02-20 14:21:26 +01:00
  • 3f523a8b58 Update trusty.xml Vengance 2016-02-20 14:20:03 +01:00
  • b4667c92e7 Delete Froxlor-master.rar Vengance 2016-02-20 13:14:16 +01:00
  • 2ce488c03c Update jessie.xml Vengance 2016-02-20 12:49:18 +01:00
  • e1448859c9 Added files via upload Vengance 2016-02-20 12:46:48 +01:00
  • 8abd041f36 Remove certificate on removal of subdomain, fixes #1596 Florian Aders 2016-02-19 21:01:41 +01:00
  • dabd4a4a4e Merge pull request #298 from nachtgeist/logging Florian Aders 2016-02-19 20:46:22 +01:00
  • 6ac274a706 cron/apache: use correct constant for loglevel Daniel Reichelt 2016-02-19 18:49:35 +01:00
  • 3d2b672feb cron logging: really print messages of level >= LOG_WARNING Daniel Reichelt 2016-02-19 18:48:20 +01:00
  • e621e02f92 Allow selecting new keysize, fixes #1594 Florian Aders 2016-02-19 17:35:44 +01:00
  • e3a594f3e7 do not post configuration form when nothing is selected, fixes #1595 Michael Kaufmann (d00p) 2016-02-19 16:09:50 +01:00
  • 5982f86db4 Merge pull request #297 from nachtgeist/le Florian Aders 2016-02-19 14:53:37 +01:00
  • b071b8c2d9 LE: remove challenge file on failure, take #2 ;) Daniel Reichelt 2016-02-19 14:43:52 +01:00
  • 185178a91e LE: whitespace fixes Daniel Reichelt 2016-02-19 14:37:41 +01:00
  • 9ca31c10ae Only store accountkeys in production Florian Aders 2016-02-19 12:27:17 +01:00
  • 8784efd063 Adding .well-known to .gitignore Florian Aders 2016-02-19 09:41:47 +01:00
  • c828e3b0d9 Fixed comment :P Florian Aders 2016-02-18 22:40:31 +01:00
  • 45c081990a We don't need to check for the documentroot anymore Florian Aders 2016-02-18 22:26:44 +01:00
  • 51b2dc7c23 Alias - configs for Let's Encrypt I forgot Florian Aders 2016-02-18 21:54:59 +01:00
  • 9f54e60056 Answer all Let's Encrypt challenges via alias to a directory in Froxlor itself, enables us to answer challenges before the vhost is set, thx PrfDrDrStullenBr for the idea \(vhost - configs for most distributions untested\) Florian Aders 2016-02-18 21:43:44 +01:00
  • 5151f50d49 Renamed "debugHandler" to "logger" to be more specific Florian Aders 2016-02-18 20:47:47 +01:00
  • 9b08d67ea7 Remove challengefile if challenge fails, thx nachtgeist Florian Aders 2016-02-18 20:40:41 +01:00
  • b002d687c0 Fixed typo Florian Aders 2016-02-18 14:56:18 +01:00
  • 1d2b697742 Merge pull request #296 from nachtgeist/logging Michael Kaufmann 2016-02-18 10:08:55 +01:00
  • ac52802caa logging: replace hard-coded number by PHP loglevel constant Daniel Reichelt 2016-02-18 09:18:26 +01:00
  • ef3ab72082 Explain more stuff in the logmessages Florian Aders 2016-02-17 15:50:09 +01:00
  • aede590af0 Merge pull request #294 from megaspatz/bugfix-letsencrypt-logging Florian Aders 2016-02-17 15:23:41 +01:00