ISPConfig 3:8de24d4a4c4dd9b0e87c524b8021b06f5055394f commitshttps://git.ispconfig.org/Sroka/ispconfig3/-/commits/8de24d4a4c4dd9b0e87c524b8021b06f5055394f2016-09-14T12:49:30+02:00https://git.ispconfig.org/Sroka/ispconfig3/-/commit/8de24d4a4c4dd9b0e87c524b8021b06f5055394fFixes #41462016-09-14T12:49:30+02:00Florian Schaalinfo@schaal-24.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/3c8467b06b9a63e3d5ed088bdcaea0259dff5d42Fixes #41602016-09-14T12:14:46+02:00Florian Schaalinfo@schaal-24.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/4fc5a8a457ffd3a6c3e465f0c1d21df7687a45a8Fixes #41892016-09-14T11:43:17+02:00Florian Schaalinfo@schaal-24.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/d3279075ed8bc3b29bc0c1e2636e416436f72e78Merge branch 'dnssec-cron-slaveblock' into 'stable-3.1'2016-09-13T14:23:03+02:00Till Brehmtbrehm@ispconfig.org
DNSSEC-Cronjob should only run on ispconfig master as we are working with datalo…
…g and not accessing things directly
<a href="/tbrehm" data-reference-type="user" data-user="1" data-container="body" data-placement="top" class="gfm gfm-project_member js-user-link" title="Till Brehm">@tbrehm</a>, am I right that `$app->db->datalogUpdate`for a soa on the ispc master does also update the dns_soa table in master database or do I have to do this by hand?
This could probably be a reason for the issue of <a href="/jnorell" data-reference-type="user" data-user="377" data-container="body" data-placement="top" class="gfm gfm-project_member js-user-link" title="Jesse Norell">@jnorell</a> in #1491 ...
See merge request !446https://git.ispconfig.org/Sroka/ispconfig3/-/commit/6c9ed8a77931ee80b12a2db041d16ffbc5df7e15Merge branch 'fix-updater-appsvhost-config' into 'stable-3.1'2016-09-13T14:22:37+02:00Till Brehmtbrehm@ispconfig.org
Fix updater appsvhost config
closes <a href="/ispconfig/ispconfig3/-/issues/4177" data-reference-type="issue" data-original="ispconfig/ispconfig3#4177" data-link="false" data-link-reference="false" data-project="1" data-issue="22598" data-project-path="ispconfig/ispconfig3" data-iid="4177" data-issue-type="issue" data-container="body" data-placement="top" title="3.1 update broke control panel web config" class="gfm gfm-issue">ispconfig/ispconfig3#4177</a>
See merge request !447https://git.ispconfig.org/Sroka/ispconfig3/-/commit/bc55aadd8a7a2d9711b5bd223272e17376cb73d5added server ini config to $conf and corrected check for apps vhost enabled2016-09-13T11:22:50+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/c028f1b816e192cc86ccb130f5524b22e2db60a5check if wanted before configuration the apps vHost2016-09-13T10:19:29+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/9b91d5add2589c12886bde1aa5ad7a2c7bc5f4e1fixed code styling (bit of a perfectionist) - Looks like someone accidentiall...2016-09-13T10:15:45+02:00A. Täffnerdarkalex@firesplash.defixed code styling (bit of a perfectionist) - Looks like someone accidentially removed an if clause here before and fixing killed styling.
https://git.ispconfig.org/Sroka/ispconfig3/-/commit/ec4dd5b94900fc4c221c84e7d8d08b18718f4df0DNSSEC-Cronjob should only run on ispconfig master as we are working with...2016-09-12T19:00:47+02:00Alexalex@taeffner.netDNSSEC-Cronjob should only run on ispconfig master as we are working with datalog and not accessing things directlyhttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/fca439226e22689d30bb9c1b6c749ee81c19a624Merge branch 'patch-5' into 'stable-3.1'2016-09-12T14:48:02+02:00Till Brehmtbrehm@ispconfig.org
Make sure admin check apply to all admins and not just user 1.
Make sure admin check apply to all admins and not just user 1.
See merge request !443https://git.ispconfig.org/Sroka/ispconfig3/-/commit/97182ec0696a0344afba26a72cec5afc56fa5404Make sure admin check apply to all admins and not just user 1.2016-09-12T14:00:32+02:00Martinmartin@enavn.comhttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/504ba30493d608561211b31eb0f14a08808fd013Merge branch 'updater-interactive-service-config' into 'stable-3.1'2016-09-09T08:58:04+02:00Till Brehmtbrehm@ispconfig.org
Updater interactive service config -> Fixes and improvements
This will fix the missing web config if ISPC Panel is to be updated on this host.
It simply overrides the $conf['services']['web'] at config decisions.
There is still one tiny bug left over: When selection yes to configure a newly detected service the field in database is not switched. Can you, <a href="/tbrehm" data-reference-type="user" data-user="1" data-container="body" data-placement="top" class="gfm gfm-project_member js-user-link" title="Till Brehm">@tbrehm</a> guide me to where I have to search for this or is this simply not possible? But IIRC the updater enabled installed services before...
It's not that hard to add a qquery to enable it but if there already si a mechanism I would love to reuse / fix it.
fixes <a href="/ispconfig/ispconfig3/-/issues/4177" data-reference-type="issue" data-original="ispconfig/ispconfig3#4177" data-link="false" data-link-reference="false" data-project="1" data-issue="22598" data-project-path="ispconfig/ispconfig3" data-iid="4177" data-issue-type="issue" data-container="body" data-placement="top" title="3.1 update broke control panel web config" class="gfm gfm-issue">ispconfig/ispconfig3#4177</a>
See merge request !438https://git.ispconfig.org/Sroka/ispconfig3/-/commit/80b6127bd2a455264ad47e2626b702a4a83df3baadded own query to set service config in DB - works!2016-09-08T19:45:35+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/a0fd0933283f908a022a4c045c02ce790d24b2b5Revert "new query style for server config - but still not working as expected...2016-09-08T18:34:51+02:00A. Täffnerdarkalex@firesplash.deIt broke the installer
This reverts commit <a href="/vojtech.myslivec/ispconfig3/-/commit/07a7ae1f12d635b0d7bdd07df793194840d93591" data-reference-type="commit" data-original="07a7ae1f12d635b0d7bdd07df793194840d93591" data-link="false" data-link-reference="false" data-project="426" data-commit="07a7ae1f12d635b0d7bdd07df793194840d93591" data-container="body" data-placement="top" title="new query style for server config - but still not working as expected..." class="gfm gfm-commit has-tooltip">07a7ae1f</a>.
Conflicts:
install/lib/installer_base.lib.phphttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/024da85108cd1b05dfa37398e60fbfecc945efcetemp commit - will likely be reverted2016-09-08T18:32:10+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/07a7ae1f12d635b0d7bdd07df793194840d93591new query style for server config - but still not working as expected...2016-09-08T17:17:05+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/de76af753b9e4f3190cd72c6df42c2a01d429cddremoved check against web service for install state of panel (when config fil...2016-09-08T15:48:06+02:00A. Täffnerdarkalex@firesplash.deremoved check against web service for install state of panel (when config file is there, installer installed it which assures that webserver is installed and configured - or someone messed around)
https://git.ispconfig.org/Sroka/ispconfig3/-/commit/ee403cf4ffcd539c8511d2dd5bd5f03d81eb7741offbranch: fixed code styling2016-09-08T15:36:26+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/01b4d31a16607363a41afd749f7995ab215b89e2probable compatibility issue fixed2016-09-08T10:42:52+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/e678c93f6a3d302cc3ea5e1451b7561a04ba2db2restart webserver when panel is installed regardless of users choice... Furth...2016-09-08T10:34:17+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/ef64cd3029048a3aee68ae8d744369bac44b2321fixed a missing semikolon, colored the warning message2016-09-08T10:32:35+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/3da03977f5beba6940403f4308d9b72a16b5c0fdImplementation of detection override to configure webserver wheenver the pane...2016-09-08T10:19:34+02:00A. Täffnerdarkalex@firesplash.deImplementation of detection override to configure webserver wheenver the panel is installed on the host regardless of user's preference
https://git.ispconfig.org/Sroka/ispconfig3/-/commit/63e4afa2519854a38360000f66b0cef94fe25114Merge branch 'updater-interactive-service-config' into 'stable-3.1'2016-09-07T19:24:35+02:00Till Brehmtbrehm@ispconfig.org
added request for DB Server on update
Please review this as I don't know if there was any incompatible reason why db was always enabled hard coded or if it's just as it would have been detected anyways as it's always on a ISPC-Server.
If you and ISPC are fine with probably getting a value `$conf['services']['db']` which is `false` on user behalf, then just merge without any further request.
Merging this really and ultimately fixes <a href="/ispconfig/ispconfig3/-/issues/4050" data-reference-type="issue" data-original="ispconfig/ispconfig3#4050" data-link="false" data-link-reference="false" data-project="1" data-issue="22471" data-project-path="ispconfig/ispconfig3" data-iid="4050" data-issue-type="issue" data-container="body" data-placement="top" title="3.1 update (update.php) enables wrong services on slave servers" class="gfm gfm-issue">ispconfig/ispconfig3#4050</a>
See merge request !437https://git.ispconfig.org/Sroka/ispconfig3/-/commit/51bdf71e256c16ff531b1c2a742ce2352c75d294Merge branch 'fix-quota-messages' into 'stable-3.1'2016-09-07T18:31:00+02:00Till Brehmtbrehm@ispconfig.org
imported vladki's fix for nightly db quota messages
Import from: <a href="https://www.howtoforge.com/community/threads/quota-warnings-notifications.73747/#post-347405" rel="nofollow noreferrer noopener" target="_blank">https://www.howtoforge.com/community/threads/quota-warnings-notifications.73747/#post-347405</a>
Credits go to vladki!
Just wanted to make this easier for you to import :)
I have not checked or tested this intensely!
fixes <a href="/ispconfig/ispconfig3/-/issues/4170" data-reference-type="issue" data-original="ispconfig/ispconfig3#4170" data-link="false" data-link-reference="false" data-project="1" data-issue="22591" data-project-path="ispconfig/ispconfig3" data-iid="4170" data-issue-type="issue" data-container="body" data-placement="top" title="Nightly DB Quota OK Mails" class="gfm gfm-issue">ispconfig/ispconfig3#4170</a>
See merge request !436https://git.ispconfig.org/Sroka/ispconfig3/-/commit/83fbc5af601fd12c0a2c1f685b46701f65446c6dadded request for DB Server on update2016-09-07T15:50:15+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/a5571501c28127728d6acc1509b51c4f907bbcdcimported vladki's fix for nightly db quota messages2016-09-07T15:41:50+02:00A. Täffnerdarkalex@firesplash.de<a href="https://www.howtoforge.com/community/threads/quota-warnings-notifications.73747/#post-347405" rel="nofollow noreferrer noopener" target="_blank">https://www.howtoforge.com/community/threads/quota-warnings-notifications.73747/#post-347405</a>https://git.ispconfig.org/Sroka/ispconfig3/-/commit/68476826181a676e3023243cdb0bcb531d3877f2Merge branch 'datalog-notification-leftover-fix' into 'stable-3.1'2016-09-05T13:39:34+02:00Till Brehmtbrehm@ispconfig.org
css leftover for default template to fix notification position.
See merge request !435https://git.ispconfig.org/Sroka/ispconfig3/-/commit/87ec4c6512f491c3d56b5090114735975da1776fcss leftover for default template to fix notification position.2016-09-05T13:31:14+02:00Pascal Dreissenpascal@dreissen.nlhttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/ec1ea49b277fd7b516dcae81e54aeac8bb5e546fMerge branch 'updater-interactive-service-config' into 'stable-3.1'2016-09-02T11:46:07+02:00Till Brehmtbrehm@ispconfig.org
Updater interactive service config
I hope this is okay for you. Please have a quick look at docs/autoinstall_samples/autoinstall.ini.sample if that syntax is okay.
This MR closes <a href="/ispconfig/ispconfig3/-/issues/4163" data-reference-type="issue" data-original="ispconfig/ispconfig3#4163" data-link="false" data-link-reference="false" data-project="1" data-issue="22584" data-project-path="ispconfig/ispconfig3" data-iid="4163" data-issue-type="issue" data-container="body" data-placement="top" title="Update-Script: Do not configure new services without request" class="gfm gfm-issue">#4163</a>
and also closes <a href="/ispconfig/ispconfig3/-/issues/4050" data-reference-type="issue" data-original="ispconfig/ispconfig3#4050" data-link="false" data-link-reference="false" data-project="1" data-issue="22471" data-project-path="ispconfig/ispconfig3" data-iid="4050" data-issue-type="issue" data-container="body" data-placement="top" title="3.1 update (update.php) enables wrong services on slave servers" class="gfm gfm-issue">#4050</a>
Tested on Master-Slave and confirmed working on both. See comments.
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/431" data-reference-type="merge_request" data-original="!431" data-link="false" data-link-reference="false" data-project="1" data-merge-request="490" data-project-path="ispconfig/ispconfig3" data-iid="431" data-container="body" data-placement="top" title="Updater interactive service config" class="gfm gfm-merge_request">!431</a>https://git.ispconfig.org/Sroka/ispconfig3/-/commit/b05d19ad1d39a051215dae9a92c1a392189ade59Merge branch 'fix-munin-monit-htmlid' into 'stable-3.1'2016-09-02T11:43:02+02:00Till Brehmtbrehm@ispconfig.org
fixed html id in nav for munin
just a minimal bug. At least I think so... Or did I understand this wrong?
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/433" data-reference-type="merge_request" data-original="!433" data-link="false" data-link-reference="false" data-project="1" data-merge-request="492" data-project-path="ispconfig/ispconfig3" data-iid="433" data-container="body" data-placement="top" title="fixed html id in nav for munin" class="gfm gfm-merge_request">!433</a>https://git.ispconfig.org/Sroka/ispconfig3/-/commit/7a14a9c6348ce73f51a31499e0d85c2e764aac1efixed html id in nav for munin2016-09-02T10:24:22+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/7bba85efd90d280fa4168ab0fdf1b42944128e19added autoconfig entries for new service detection2016-09-01T15:46:52+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/b77400a961f82a57c634a794f94ae459bafcc1b0updater: db-query working, requests working. This will be my MR and hopefully...2016-09-01T15:39:33+02:00A. Täffnerdarkalex@firesplash.deupdater: db-query working, requests working. This will be my MR and hopefully fixes <a href="/ispconfig/ispconfig3/-/issues/4163" data-reference-type="issue" data-original="ispconfig/ispconfig3#4163" data-link="false" data-link-reference="false" data-project="1" data-issue="22584" data-project-path="ispconfig/ispconfig3" data-iid="4163" data-issue-type="issue" data-container="body" data-placement="top" title="Update-Script: Do not configure new services without request" class="gfm gfm-issue">ispconfig/ispconfig3#4163</a> and hopefully also fixes <a href="/ispconfig/ispconfig3/-/issues/4050" data-reference-type="issue" data-original="ispconfig/ispconfig3#4050" data-link="false" data-link-reference="false" data-project="1" data-issue="22471" data-project-path="ispconfig/ispconfig3" data-iid="4050" data-issue-type="issue" data-container="body" data-placement="top" title="3.1 update (update.php) enables wrong services on slave servers" class="gfm gfm-issue">ispconfig/ispconfig3#4050</a>
https://git.ispconfig.org/Sroka/ispconfig3/-/commit/bd494ec751e09668715f43f27b6f20bc83dc962euüdater: implemented request on new/vanished service detection2016-09-01T14:05:00+02:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/83e5ef3c9983f080f4c24d75d6a0a48f564e78edMerge branch 'patch-2' into 'stable-3.1'2016-08-31T10:54:33+02:00Till Brehmtbrehm@ispconfig.org
Fixes db quota (typo)
Fixes db quota (typo) <a href="/ispconfig/ispconfig3/-/issues/4158" data-reference-type="issue" data-original="#4158" data-link="false" data-link-reference="false" data-project="1" data-issue="22579" data-project-path="ispconfig/ispconfig3" data-iid="4158" data-issue-type="issue" data-container="body" data-placement="top" title="Database quota warning mail despite 0MB Limit" class="gfm gfm-issue">#4158</a>
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/430" data-reference-type="merge_request" data-original="!430" data-link="false" data-link-reference="false" data-project="1" data-merge-request="489" data-project-path="ispconfig/ispconfig3" data-iid="430" data-container="body" data-placement="top" title="Fixes db quota (typo)" class="gfm gfm-merge_request">!430</a>https://git.ispconfig.org/Sroka/ispconfig3/-/commit/7449fb5315d790e7002df95e872641a87d886139Fixes db quota (typo)2016-08-31T08:54:44+02:00Linuslinus@linus9000.dehttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/ec3abd2ae89fd29708c9123a8b3cf4ec085162a8Increase API session timeout to 30 minutes.2016-08-30T09:10:52+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/826789a04680a064998d9651b553bf2b25627387Fixed: #4150 Outgoing bcc warning: empty lookup result2016-08-26T18:33:24+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/Sroka/ispconfig3/-/commit/2d1e0ddbade2979ea561917ade769ea8dd4d66b0Merge branch 'stable-3.1' into 'stable-3.1'2016-08-26T15:54:47+02:00Till Brehmtbrehm@ispconfig.org
Stable 3.1
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/429" data-reference-type="merge_request" data-original="!429" data-link="false" data-link-reference="false" data-project="1" data-merge-request="488" data-project-path="ispconfig/ispconfig3" data-iid="429" data-container="body" data-placement="top" title="Stable 3.1" class="gfm gfm-merge_request">!429</a>https://git.ispconfig.org/Sroka/ispconfig3/-/commit/7fc30f8220bbeb20e5d57f5a6f9378c81820e981db-quota-notify2016-08-26T12:51:27+02:00Florian Schaalflorian@schaal-24.de