Compare commits

...

3572 commits

Author SHA1 Message Date
Rafael G. Martins
873693b2ed
Merge pull request #2302 from pdapnz/fix_bug_url_parsing
fix bug https://github.com/outroll/vesta/issues/2301
2025-04-25 13:41:17 +10:00
Rafael G. Martins
2a91899846
Update README.md to use HTTPS
Updating readme as new Vesta server requires HTTPS, otherwise installers get a 301 redirect.
2024-07-02 13:34:58 +10:00
pdapnz
2a6852b805
fix bug https://github.com/outroll/vesta/issues/2301 2024-04-18 12:52:49 +03:00
Rafael G. Martins
f978badd95
Add community notice to readme 2024-02-26 13:42:55 +11:00
Anton Reutov
73d60c4591
Merge pull request #2271 from makss/fix/sys_temp_dir
Added sys_temp_dir to all apache/php-fpm configs
2022-12-08 13:41:08 +03:00
Anton Reutov
93f4b6c182
Merge pull request #2272 from makss/fix/lang_ru
Fix lang file: Remove duplicate line
2022-12-08 12:54:44 +03:00
makss
343a877f06 Remove duplicate line 2022-12-08 04:11:11 +02:00
makss
1d7978ae2c fix align 2022-12-08 02:35:36 +02:00
makss
762d7586e0 Added sys_temp_dir for php-fpm 2022-12-08 02:22:23 +02:00
makss
564af6aa2d Added sys_temp_dir for pma 2022-12-08 02:13:23 +02:00
makss
8f6ac637d8 Added sys_temp_dir in all apache2 templates 2022-12-08 02:03:15 +02:00
Anton Reutov
e6df9a65a2
1.0.0-7 2022-10-11 22:49:28 +03:00
Anton Reutov
ffd180b4f7
1.0.0-7 2022-10-11 22:47:22 +03:00
Anton Reutov
371cc02eda
1.0.0-7 2022-10-11 22:44:36 +03:00
Anton Reutov
94d60267a8
Merge pull request #2268 from serghey-rodin/feature/r-1.0.0.7
Release UI 1.0.0.7
2022-10-11 10:59:25 +03:00
Alexander
c053bb4c1c Fixed FM event listeners. 2022-10-10 20:21:54 +03:00
Alexander
4c78719897 Release UI 1.0.0.7 2022-10-04 22:32:09 +03:00
Anton Reutov
765a67a6eb
Merge pull request #2267 from akbarali1/master
Update Lang uz.php
2022-09-29 17:47:46 +03:00
Akbarali
99cb78ce81
Merge branch 'serghey-rodin:master' into master 2022-09-29 19:26:17 +05:00
Akbarali
56c66fdef0 Update uz.php 2022-09-29 19:23:21 +05:00
Anton Reutov
a2ebd2efdc
Merge pull request #2266 from akbarali1/master
Added Uzbek language
2022-09-28 14:53:21 +03:00
Akbarali
c28f745069 adding uzbek lang 2022-09-28 10:34:48 +05:00
Anton Reutov
1a37b33eb2
Choose php version 2022-09-15 21:01:39 +03:00
Anton Reutov
ee48d9a406
Merge pull request #2253 from kingofkya/master
Add a templet for freescout helpdesk software
2022-07-29 12:30:09 +03:00
Anton Reutov
b4dab88694
Merge pull request #2257 from serghey-rodin/fix/edit-server
Fixed incorrect mail url in response.
2022-07-29 12:29:30 +03:00
Anton Reutov
51e468c22f
Merge pull request #2258 from divinity76/patch-5
fix xss / GH-2252
2022-07-27 13:46:51 +03:00
divinity76
7c4e9bad7d
JSON not JS brainfart 2022-07-23 09:29:12 +02:00
divinity76
0682f7b10c
fix xss / GH-2252
ref https://github.com/serghey-rodin/vesta/issues/2252
2022-07-23 09:26:16 +02:00
Alexander
1ce9ec299c Fixed incorrect mail url in response. 2022-07-21 22:11:36 +03:00
Anton Reutov
e527827174
Merge pull request #2256 from serghey-rodin/feature/reset-mail
Added mail reset in API
2022-07-19 21:43:29 +03:00
Alexander
6714e1d35d Added mail reset in API 2022-07-19 20:02:53 +03:00
Anton Reutov
d386c3598c
Fix for Sed Injection Vulnerability
Thanks to @hestiacp and @jaapmarcus for fix.
2022-07-18 13:08:50 +03:00
Anton Reutov
39561c32c1
Fix for Sed Injection Vulnerability
Thanks to @hestiacp and @jaapmarcus for fix.
2022-07-18 13:06:39 +03:00
Travis Kneale
8bc587db41
freescout templetes
Add config for https://freescout.net/
2022-06-13 22:57:15 -07:00
Travis Kneale
da853d78cb
freescout templete
Add config for https://freescout.net/
2022-06-13 22:56:08 -07:00
Anton Reutov
956bc6697c
1.0.0-6 2022-02-24 12:00:41 +03:00
Anton
8efaf5fe93 react build 1.0.0.6 2022-02-23 18:49:31 +03:00
Anton Reutov
0b95fc283e
1.0.0-6 2022-01-16 03:23:18 +03:00
Anton Reutov
969dc68561
1.0.0-6 2022-01-16 03:22:32 +03:00
Alexander Osinskii
653348242f
Merge pull request #2220 from serghey-rodin/release/1.0.0-6-ui
UI 1.0.0-6 release.
2021-12-30 22:02:52 +00:00
Alexander Osinskii
64ddc9cfe8
Merge pull request #2221 from serghey-rodin/release/1.0.0-6-api
API 1.0.0-6 release.
2021-12-30 22:02:37 +00:00
Alexander
b7bdfd2d87 API 1.0.0-6 release. 2021-12-30 21:58:29 +00:00
Alexander
0420ecc0e6 UI 1.0.0-6 release. 2021-12-30 21:53:38 +00:00
Anton Reutov
22f3dd11e2
Merge pull request #2203 from devius/master
Fix existing translations for Georgian Language.
2021-12-03 13:34:32 +03:00
devius
df5962fc2e fix minor typos. 2021-12-03 04:01:14 +04:00
devius
c863a592a5 Fix existing strings and add new ones missing. 2021-12-03 03:59:46 +04:00
Serghey Rodin
067d43b418 react build 1.0.0.5 2021-11-23 00:45:37 +02:00
Alexander Osinskii
2f3041bf05
Merge pull request #2185 from serghey-rodin/feature/responsive-design
Added new responsive design features.
2021-11-22 23:45:51 +02:00
Alexander Osinskii
5dc474846b
Merge pull request #2184 from serghey-rodin/feature/disk-percentage-values
Added disk and bandwidth percentage values to the session response.
2021-11-22 23:45:44 +02:00
Alexander
4871bd1326 Removed desktop toolbar scrollbar. 2021-11-22 23:44:41 +02:00
Alexander
7ebcab3cbf Added new responsive design features. 2021-11-22 23:18:15 +02:00
Alexander
cae9a1550d Added disk and bandwidth percentage values to the session response. 2021-11-22 23:14:32 +02:00
Anton Reutov
7d317c4fe8
1.0.0-5 2021-11-22 02:57:10 +03:00
Anton Reutov
84bc07d8f1
1.0.0-5 2021-11-22 00:33:21 +03:00
Anton Reutov
97f558465e
Avoiding error if unzip destination exists 2021-11-21 21:18:47 +03:00
Serghey Rodin
f8936c6847
Merge pull request #2182 from misterV12/patch-1
Dont match wildcard "*domains" and "databases*" while restoring
2021-11-20 17:35:36 +02:00
misterV12
1dee07c3f1
Dont match wildcard "*domains" and "databases*" while restoring 2021-11-20 15:41:22 +01:00
Anton Reutov
2e7083668c Set correct quotation marks 2021-11-13 16:59:39 +03:00
Anton Reutov
bf65cae7f9
Fix for "chmod: changing permissions" 2021-11-13 11:42:53 +03:00
Anton Reutov
c7bef6bf33
1.0.0-5 2021-11-09 20:37:32 +03:00
Anton Reutov
bb4fc4c47d
1.0.0-5 2021-11-09 20:35:32 +03:00
Anton Reutov
e2e3d1d113
Merge pull request #1663 from serghey-rodin/dpeca-patch-exim-1
Tell Exim to not to deny emails if ClamAV is unavailable or busy
2021-11-07 01:03:38 +03:00
Anton Reutov
bdf140d3c9
Merge pull request #1665 from serghey-rodin/dpeca-patch-exim-3
Block .jar extension in email attachments in Exim
2021-11-07 00:55:15 +03:00
Alexander Osinskii
f53183cb7f
Merge pull request #2147 from serghey-rodin/feature/static-media
Removed unused static media.
2021-11-06 18:29:17 +02:00
Alexander Osinskii
1c46ce5cf7
Merge pull request #2146 from serghey-rodin/feature/api-enhancements
Added few auxiliary values from user session. Improved user, web and …
2021-11-06 18:29:06 +02:00
Alexander Osinskii
89b3328a0d
Merge pull request #2145 from serghey-rodin/feature/improved-panel-and-fm
FM progress bar while uploading. Minor CPanel improvements as well as…
2021-11-06 18:28:50 +02:00
Alexander
0c656b0c20 Removed unused static media. 2021-11-06 17:51:56 +02:00
Alexander
c308a42d2f Added few auxiliary values from user session. Improved user, web and server api endpoints. 2021-11-06 17:50:50 +02:00
Alexander
5b2c180d86 FM progress bar while uploading. Minor CPanel improvements as well as performance. 2021-11-06 17:47:44 +02:00
dpeca
eb5a045252
Hot fix for CentOS 6 for "systemctl"
Because I made this issue :)
2021-11-04 13:59:10 +01:00
Serghey Rodin
09e87f4af6 set rel date: Mon Nov 1 2021 2021-11-02 00:14:47 +02:00
Serghey Rodin
8ec606d5f6 fix dates in rpm history definition 2021-11-01 23:49:52 +02:00
Serghey Rodin
354bacf1f3 Merge branch 'master' of github.com:serghey-rodin/vesta 2021-11-01 23:43:46 +02:00
Serghey Rodin
c5612c827a update static react build 2021-11-01 23:41:59 +02:00
Serghey Rodin
a60b158049
Merge pull request #2129 from serghey-rodin/Skamasle-patch-10
NGINX wont start in debian 9
2021-11-01 23:38:45 +02:00
Serghey Rodin
790cd631a6 1.0.0-4 2021-11-01 23:38:15 +02:00
Serghey Rodin
32a6be9adf
Merge pull request #2128 from serghey-rodin/feature/improved-le-and-csr
Improved LE support and CSR is now generted in modal window with cert…
2021-11-01 23:33:35 +02:00
Maksim Usmanov | Maks
51a95b9d72
NGINX wont start in debian 9 2021-11-01 22:31:26 +01:00
Alexander
62d9652437 Improved LE support and CSR is now generted in modal window with cert prepopulating feature. 2021-11-01 23:29:05 +02:00
Anton Reutov
8f8dbd5b25
Update nginx.conf 2021-11-02 00:24:51 +03:00
Anton Reutov
60f75bc739
Update nginx.conf 2021-11-02 00:22:48 +03:00
Anton Reutov
fc2403dc2f
Update nginx.conf 2021-11-02 00:16:17 +03:00
Serghey Rodin
ddee8801a4
Merge pull request #2112 from serghey-rodin/feature/restart-system
Added system reboot endpoint.
2021-11-01 00:24:55 +02:00
Serghey Rodin
52a5425a94
Merge pull request #2111 from serghey-rodin/feature/improved-web-and-server
Improved server sys tab and web backend template.
2021-11-01 00:24:11 +02:00
Alexander
85ee500306 Added system reboot endpoint. 2021-11-01 00:22:15 +02:00
Serghey Rodin
85fb81f6d2 fix WEB_BACKEND/PROXY_SYSTEM switch 2021-11-01 00:17:22 +02:00
Alexander
f012520f0e Improved server sys tab and web backend template. 2021-11-01 00:16:35 +02:00
Serghey Rodin
96124cca25 add missing static files 2021-10-31 23:50:23 +02:00
Serghey Rodin
185f70651e 1.0.0-3 2021-10-31 23:46:12 +02:00
Serghey Rodin
612b8cbfc0 latest UI build 2021-10-31 23:43:14 +02:00
Serghey Rodin
d67ea881fc
Merge pull request #2109 from serghey-rodin/feature/improved-react-ui
Improved new react ui and added view for CSR generation.
2021-10-31 23:32:13 +02:00
Serghey Rodin
604f1948e4
Merge pull request #2108 from serghey-rodin/feature/updated-api-responses
Updated and improved API respones.
2021-10-31 23:31:37 +02:00
Alexander
e66ec829f7 Improved new react ui and added view for CSR generation. 2021-10-31 23:27:00 +02:00
Serghey Rodin
334ee00d25
Merge pull request #2090 from mix5003/exclude-react-build
exclude react build tool from git
2021-10-31 23:25:35 +02:00
Alexander
859e65647f Updated and improved API respones. 2021-10-31 23:24:42 +02:00
Serghey Rodin
387e6c8e0a revert back react handler 2021-10-31 21:46:06 +02:00
mix5003
ec355d8137 exclude react build 2021-10-31 16:59:51 +07:00
Serghey Rodin
b543c0c2f3 partially revert pr changes 2021-10-30 22:51:04 +03:00
Serghey Rodin
ed94787cd0
Merge pull request #2078 from mix5003/fix-v-ssl
Fix Edit Web page error
2021-10-30 22:49:13 +03:00
Serghey Rodin
5f86fab58b add backup validation for scheduled restore 2021-10-30 22:26:42 +03:00
mix5003
335fd746db fix ca name 2021-10-30 21:54:23 +07:00
mix5003
43a6fc23ef fix can not save proxy template 2021-10-30 21:28:08 +07:00
mix5003
57401060c8 fix can not edit proxy template 2021-10-30 21:05:45 +07:00
mix5003
b539119ead fix incorrect field name 2021-10-30 20:41:31 +07:00
Serghey Rodin
2c79b0874b hotfix: update package name condition 2021-10-30 16:39:10 +03:00
mix5003
fabe2f1ec7 fix incorrect v_ssl field name 2021-10-30 20:22:55 +07:00
Anton Reutov
06a97a5551
Merge pull request #2074 from mix5003/fix-fi
fix incorrect open if
2021-10-30 16:02:27 +03:00
Serghey Rodin
b0bcc43154 add %global debug_package %{nil} in vesta-softaculous spec 2021-10-30 13:46:50 +03:00
Serghey Rodin
b8083e008d add %global debug_package %{nil} in vesta-ioncube spec 2021-10-30 13:28:07 +03:00
Serghey Rodin
539a926026 add %global debug_package %{nil} 2021-10-30 12:36:39 +03:00
mix5003
1738423829 fix fi 2021-10-30 08:56:54 +07:00
Serghey Rodin
474257fd72 add ZEND_EXTRA_LIBS='-lresolv' 2021-10-29 18:39:08 +03:00
Serghey Rodin
8f10e5f94d add zip support for built-in php 2021-10-29 16:45:28 +03:00
Serghey Rodin
6e4c59ab0d update notifications 2021-10-29 14:37:29 +03:00
Serghey Rodin
781933ea48 new vesta logo 2021-10-29 13:55:35 +03:00
Serghey Rodin
a7c5714d85
Merge pull request #2073 from serghey-rodin/feature/react-ui-and-api
Feature/react UI and api
2021-10-29 13:46:52 +03:00
Alexander
1ab9e12f2c Updated react ui. 2021-10-29 13:07:10 +03:00
Alexander
0bb63b01c4 Removed server side pages rendering. 2021-10-29 13:02:40 +03:00
Serghey Rodin
be834ddd17 add react static build 2021-10-29 11:30:04 +03:00
Serghey Rodin
93e9fe9f99 disable old php api 2021-10-29 11:29:30 +03:00
Serghey Rodin
08513755b2 move react sources to src dir 2021-10-29 10:38:02 +03:00
Serghey Rodin
8e97eb2dad improved package check 2021-10-29 10:33:52 +03:00
Serghey Rodin
926376295a delete clamd.scan index.php 2021-10-28 23:30:21 +03:00
Serghey Rodin
718e458fc9 Merge branch 'master' of github.com:serghey-rodin/vesta 2021-10-28 23:29:24 +03:00
Serghey Rodin
dbbbe94d8f set version to 1.0.0 2021-10-28 23:28:57 +03:00
Serghey Rodin
bfc94fbd10 added dns record and user search 2021-10-28 23:22:31 +03:00
Serghey Rodin
fb9d3fddb0
Merge pull request #1988 from serghey-rodin/Skamasle-patch-9
Fix reset password from CLI / roundcube
2021-10-28 23:13:05 +03:00
Serghey Rodin
5f0856f1c4
Merge pull request #1975 from Daniyal-Javani/fix-ftp-restore-path
Fix ftp restore path
2021-10-28 23:09:26 +03:00
Serghey Rodin
70748e302e
Merge pull request #1798 from cmstew/cmstew-amazon-linux-clamd-patch
cmstew amazon linux clamd patch
2021-10-28 23:07:04 +03:00
Serghey Rodin
7444a6b0a9
Merge pull request #1791 from henri-hulski/backend_port
Increment backend port also when commented
2021-10-28 23:01:19 +03:00
Serghey Rodin
638ef7de51
Merge pull request #2040 from AiratHalitov/mem-rrd-patch
Update v-update-sys-rrd-mem
2021-10-28 22:56:40 +03:00
Serghey Rodin
3431bbbd8f
Merge pull request #2069 from lotarbo/patch-1
refactor: drop TLSv1.1 support in rhel 7
2021-10-28 22:53:56 +03:00
Serghey Rodin
f832525f65
Merge pull request #2071 from serghey-rodin/feature/new-react-ui
Updated react UI and UX part.
2021-10-28 22:52:55 +03:00
Serghey Rodin
350c6fc9c9
Merge pull request #2072 from serghey-rodin/feature/new-api-interface
Integrated new api interface.
2021-10-28 22:52:47 +03:00
Alexander
2ecb3a10ac Fixed cron autoupdates and firewall banlist. 2021-10-28 22:51:42 +03:00
Alexander
7540c9881d Fixed Packages, Firewall and Server tabs. 2021-10-28 22:36:05 +03:00
Alexander
b7cf917141 Fixed bulk actions and few minor UX bugs. 2021-10-28 11:01:06 +03:00
Alexander
2a12fec5ea Updated services and fixed minor bugs. 2021-10-28 10:55:00 +03:00
Alexander
4306a4fb4f Integrated new api interface. 2021-10-27 11:20:24 +03:00
Alexander
91e7d9ff4a Updated react UI and UX part. 2021-10-27 11:13:28 +03:00
Anton Reutov
4a9bfc94ad
Merge pull request #2068 from jaapmarcus/vesta-ioncube-missing
Vesta-ioncube is missing
2021-10-23 13:47:27 +03:00
Serghey Rodin
c520eb283a
Merge pull request #2070 from serghey-rodin/release/react-integration
React integration ready for v1.0.0 release.
2021-10-22 17:57:08 +03:00
Alexander
095e2e9e4a React integration ready for v1.0.0 release. 2021-10-22 17:55:25 +03:00
Bogdan Lotarev
bfe31a82df refactor: drop TLSv1.1 support in rhel 7 2021-10-19 20:05:16 +03:00
Serghey Rodin
67f2ad0c99
Merge pull request #2067 from serghey-rodin/react-integration
React js integration with vesta control panel.
2021-10-14 14:49:30 +03:00
Jaap Marcus
b6e7c18e29
Vesta-ioncube is missing
Added check for vesta-ioncube
2021-10-13 11:52:52 +02:00
Alexander
c12c21ec8b React js integration with vesta control panel. 2021-10-12 21:36:52 +03:00
Serghey Rodin
4c6dd0d719
Merge pull request #2063 from graileanu/fix-poweredby
Vestacp.com link by https & solve wording confusion causing people to send abuse requests
2021-10-07 20:42:37 +03:00
Grigore Raileanu
382732f87f Replaced http by https & changed wording 2021-09-23 17:56:05 +03:00
Anton Reutov
1308b508ff SSL for hostname 2021-08-26 21:37:11 +03:00
Anton Reutov
4feb62c4c8 SSL for hostname 2021-08-26 21:36:15 +03:00
Anton Reutov
404b405656 SSL for hostname 2021-08-26 21:35:12 +03:00
Anton Reutov
1ed1505169 SSL for hostname 2021-08-26 21:33:46 +03:00
Anton Reutov
aab2b4d31d Change default vesta port 2021-08-26 18:54:16 +03:00
Anton Reutov
3f5246b144 Change default vesta port 2021-08-26 18:47:53 +03:00
Anton Reutov
1ba4238b84 Update vst-install-debian.sh 2021-08-26 18:45:15 +03:00
Anton Reutov
47dab17c48 Change default vesta port 2021-08-26 12:53:11 +03:00
Anton Reutov
6b7dc97731 Change default vesta port 2021-08-25 23:03:07 +03:00
Anton Reutov
960e3a20df GUI Change default vesta port 2021-08-24 17:33:24 +03:00
Anton Reutov
7a6dc72f29 GUI Change default vesta port 2021-08-24 17:28:47 +03:00
Anton Reutov
402a69049c
Merge pull request #1790 from molny/master
Check missing 'gnupg' package on latest fresh Ubuntu versions
2021-08-23 18:02:13 +03:00
Anton Reutov
450fa0d7d0
Update vst-install-ubuntu.sh 2021-08-23 18:01:15 +03:00
Anton Reutov
6225820910
Fix for "Broken or Risky Cryptographic Algorithm"
Fix for reflected XSS vulnerability, found by Brian Semrau
2021-08-16 14:59:41 +03:00
Anton Reutov
2fc0dc34fe
Fix for "Broken or Risky Cryptographic Algorithm" 2021-08-16 14:56:37 +03:00
Anton Reutov
6fdfef4e88
Fix for possible file inclusion vulnerability in i18n.php 2021-08-16 12:36:08 +03:00
Anton Reutov
df9377519e
Merge pull request #1785 from JOduMonT/master
add nginx template for invoice ninja
2021-08-14 23:23:08 +03:00
Anton Reutov
e01adf78f8
Added ''LE SSL for hostname'' to section about the software being installed 2021-08-14 20:04:21 +03:00
Anton Reutov
a6884ad898
Added ''LE SSL for hostname'' to section about the software being installed 2021-08-14 20:01:30 +03:00
Anton Reutov
3a0bcfea66
Added ''LE SSL for hostname'' to section about the software being installed 2021-08-14 19:59:19 +03:00
Anton Reutov
cc2d60bf05
Added ''LE SSL for hostname'' to section about the software being installed 2021-08-14 19:57:06 +03:00
Anton Reutov
b4ec733dcc
Installing gnupg 2021-08-13 21:47:09 +03:00
Anton Reutov
14a9fa4f8b
Merge pull request #1799 from cmstew/auto-hostname-ssl
Setting lets encrypt hostname ssl auto-renewal during install
2021-08-13 21:09:20 +03:00
Anton Reutov
0403b0c4a3
fix backend_template for nginx 2021-08-12 20:03:19 +03:00
Anton Reutov
b1ca176d44
fix backend_template for nginx 2021-08-12 20:01:41 +03:00
Anton Reutov
d0e9395c9f
fix backend_template for nginx 2021-08-12 20:00:44 +03:00
Anton Reutov
4affb916ef
Merge pull request #1826 from webkmua/fix-package-backend
fix backend_template save after package change
2021-08-12 19:52:49 +03:00
Anton Reutov
9aeef63ff4
Merge pull request #1987 from clarkchentw/clarkchentw-patch-1
Fix curl call
2021-08-09 21:49:05 +03:00
Anton Reutov
a6cb9df163
TLS 1.0 drop & TLS 1.3 addition #1643 2021-08-05 19:29:37 +03:00
Anton Reutov
d20a682c1d
TLS 1.0 drop & TLS 1.3 addition #1643 2021-08-05 19:12:11 +03:00
Anton Reutov
6aaf189547
TLS 1.0 drop & TLS 1.3 addition #1643 2021-08-05 18:58:36 +03:00
Anton Reutov
cc97aeef02
Merge pull request #1643 from ioannidesalex/patch-62
TLS 1.0 drop & TLS 1.3 addition
2021-08-05 18:56:58 +03:00
Anton Reutov
10a59574d7
Merge pull request #1913 from kgrzelak/patch-1
Update v-list-web-domain-ssl
2021-08-04 22:01:56 +03:00
Anton Reutov
9f26aa785e
Merge pull request #1907 from AltiUP/patch-1
Update v-add-web-domain-ftp
2021-08-04 18:33:54 +03:00
Anton Reutov
29bdd18e95
Merge pull request #1949 from NIKTONIKTO717/patch-2
Update vst-install-rhel.sh
2021-08-03 17:04:41 +03:00
Anton Reutov
88e54a8671
sed nginx no #2009 2021-08-02 16:18:48 +03:00
Anton Reutov
f3872ada4a
sed nginx no #2009 2021-08-02 16:15:43 +03:00
Anton Reutov
06ff183f21
sed nginx no 2021-08-02 16:11:10 +03:00
Anton Reutov
b0f65509e0
Merge pull request #1978 from olympy/fix-renew-ssl-on-domain-match
Fix issue #1977 / Letsencrypt ssl certificate update fails
2021-08-02 14:26:46 +03:00
Anton Reutov
78133f35aa
Update vsftpd.conf to support TLS connections 2021-08-01 15:23:41 +03:00
Anton Reutov
350a19edb1
Merge pull request #2017 from dynanode/patch-3
Update vsftpd.conf to support TLS connections
2021-08-01 15:21:32 +03:00
Anton Reutov
98fd0827be
Merge pull request #1993 from BorysVrublevskyi/cs-cart_template
cs-cart template for nginx php-fpm ubuntu 18.04
2021-07-30 16:55:52 +03:00
Anton Reutov
a8ff57047c
Merge pull request #2034 from Ham3D/add_single_page_applications_support
add single page applications support
2021-07-30 15:17:11 +03:00
Anton Reutov
9d2c0ca64c
Changes to Cloudflare Infrastructure IPs List 2021-07-30 14:51:17 +03:00
Anton Reutov
55e58f5cce
Changes to Cloudflare Infrastructure IPs List 2021-07-30 14:48:55 +03:00
Anton Reutov
ffe3e1bbd9
Changes to Cloudflare Infrastructure IPs List 2021-07-30 14:47:41 +03:00
Anton Reutov
2a2cfee433
Merge pull request #2051 from byronjumbo/patch-2
[Action May Be Required] Changes to Cloudflare Infrastructure IPs Lis…
2021-07-30 14:42:16 +03:00
Anton Reutov
76072b7398
Change default vesta port 2021-07-29 20:29:51 +03:00
Anton Reutov
b378cf18ed
Update postinst 2021-07-29 16:47:04 +03:00
Anton Reutov
d68ac3993c
stopped to renew LE if domain is not exits more 2021-07-28 20:30:03 +03:00
Anton Reutov
0cdb05bb03
send email function to full backup 2021-07-28 20:24:25 +03:00
Anton Reutov
cde1cd6651
stopped to renew LE if domain is not exit more 2021-07-28 20:12:07 +03:00
Anton Reutov
0fcbadda78
Grep carefully for 'END CERTIFICATE' 2021-07-28 19:43:04 +03:00
Anton Reutov
d97adaeb6a
Disabling login with 'root' 2021-07-28 14:19:12 +03:00
Anton Reutov
6b3cd17202
Fixing Apache status public access 2021-07-28 11:22:31 +03:00
Anton Reutov
c582ff3766
Checking period value in /list/rrd/ 2021-07-27 22:19:45 +03:00
Anton Reutov
374d6c6b19
htmlentities() for token 2021-07-27 22:01:10 +03:00
Anton Reutov
1c801b2d60
Fix for downloading backup of other users 2021-07-27 21:50:33 +03:00
Anton Reutov
1ff5208968
Preventing admin to do loginas action without token 2021-07-27 20:58:34 +03:00
Anton Reutov
b123fa2178
Making sure chmod and chown does not follow symlinks 2021-07-27 15:38:29 +03:00
Anton Reutov
393c81d46c
Making sure chmod and chown does not follow symlinks 2021-07-27 15:27:20 +03:00
Anton Reutov
93eec18723
Making sure chmod and chown does not follow symlinks 2021-07-27 15:21:52 +03:00
Anton Reutov
45b13a2105
Making sure chmod and chown does not follow symlinks 2021-07-27 15:10:04 +03:00
Anton Reutov
f41ad21e1e
Update main.sh 2021-07-27 15:06:11 +03:00
Anton Reutov
8a60b257a2
Preventing uploads from other origin 2021-07-27 14:56:35 +03:00
Anton Reutov
ea1e22613e
Restrict v-make-tmp-file to tmp folder 2021-07-27 14:42:25 +03:00
Anton Reutov
bbe06d10b6
Checking licence format 2021-07-27 14:36:41 +03:00
Anton Reutov
3c31647926
Validate user input on domain 2021-07-27 14:35:40 +03:00
Anton Reutov
10bedc72f1
Merge pull request #2059 from zidingz/patch-1
Create SECURITY.md
2021-07-26 17:14:35 +03:00
Ziding Zhang
102ecb2c32
Create SECURITY.md
For your consideration: a quick instruction for future security researchers.
2021-07-26 15:08:34 +01:00
Anton Reutov
d0a21b4859
Ensure HTML will not be displayed in list log page 2021-07-26 17:08:17 +03:00
Anton Reutov
5f92fc5380
Added interface validation 2021-07-26 16:50:25 +03:00
Anton Reutov
a4e4542a6d
Checking licence format 2021-07-26 16:41:04 +03:00
Anton Reutov
c6b79fe5da
Check if it's vesta package 2021-07-26 14:59:10 +03:00
Byron Jumbo
04bf5fc042
[Action May Be Required] Changes to Cloudflare Infrastructure IPs Listed on cloudflare.com/ips
If your security model relies on allowing a list of trusted Cloudflare IPs from cloudflare.com/ips (or via API) on your origin, please make the following changes to your allow list by May 7, 2021. This change is safe to make today.

Remove:
104.16.0.0/12

Add:
104.16.0.0/13
104.24.0.0/14
2021-04-09 08:51:52 -05:00
Made I.T
bba7400b8a
Fix duplicated DNS records in DNS cluster 2020-12-10 12:13:46 +01:00
Airat Halitov
fb7f6254fa
Update v-update-sys-rrd-mem 2020-12-04 17:27:25 +05:00
Anton Reutov
1b85b7b313
Merge pull request #2030 from myrevery/patch-1
Update cn.php
2020-10-25 23:40:53 +03:00
dpeca
d7de756d70
Merge pull request #2039 from moucho/acme_v2_GET
Deprecate GET acme v2
2020-10-25 02:20:11 +02:00
moucho
2dc4adb08e Deprecate GET acme v2 2020-10-22 13:48:45 +02:00
Hamed hojjati
246ea6888d add single page applications support 2020-10-01 11:15:23 +03:30
myrevery
8d5c2e2e8e
Update cn.php
Refine some details.
2020-09-03 12:49:00 -07:00
Anton Reutov
af94a23962
Merge pull request #2029 from myrevery/patch-1
Update cn.php
2020-08-26 16:22:54 +03:00
myrevery
ce5d209c13
Update cn.php 2020-08-25 14:58:01 -07:00
dpeca
ef0f62a59b
Also checking "" in order to detect manually chunked record
And removing brackets, since they are not necessary when whole record is in one line
2020-08-23 19:44:12 +02:00
dpeca
311827c4b3
Not chunking already manually chunked TXT records 2020-08-19 14:52:45 +02:00
dpeca
f74301b19f
Split long TXT entries into 255 chunks 2020-08-19 12:44:46 +02:00
dpeca
ccea621787
Merge pull request #1947 from dawindk/patch-1
Only exclude logs folder from root, not in public_html
2020-08-19 11:07:55 +02:00
dpeca
c171d5e68e
Merge pull request #1969 from joshbmarshall/joshbmarshall-patch-1
Bugfix deleting a PostgreSQL database
2020-08-19 11:06:39 +02:00
dynanode
3b96845f8a
Update vsftpd.conf to support TLS connections
Updated config to support TLS 1.2 connections to vsftpd only.
2020-06-25 13:59:51 +02:00
dpeca
e0ebf729f3
Avoid Let's Encrypt domain validation timeout 2020-06-23 20:20:11 +02:00
dpeca
83d0b9ed90
Allow quick restarting of nginx
It can occur if domain has many aliases, and acme-challenge should be added many times

This fix will prevent this error:
```
May 14 21:39:08 server systemd[1]: nginx.service: Start request repeated too quickly.
May 14 21:39:08 server systemd[1]: nginx.service: Failed with result 'start-limit-hit'.
```
2020-06-23 20:14:55 +02:00
dpeca
d9e9c64369
Fixing NS parameters in v-add-dns-on-web-alias 2020-06-23 20:10:54 +02:00
dpeca
8d9e349b23
Dont match subdomains while restoring domain 2020-06-23 20:08:59 +02:00
dpeca
a9e46047e9
Reset UPDATE_SSL_SCRIPT 2020-06-23 20:04:30 +02:00
dpeca
c377e19df8 Adding escapeshellarg on few more places in php code 2020-06-23 19:06:25 +02:00
dpeca
b6cadcd992 Fixing unnecessary slash in nginx configs for phpmyadmin and roundcube 2020-06-23 18:01:38 +02:00
Borys Vrublevskyi
37fc05081b cs-cart template for nginx php-fpm ubuntu 18.04 2020-04-16 16:47:23 +03:00
dpeca
cfc46bb2a9
Importing system enviroment in v-change-user-password
Thanks to @ScIT-Raphael for discovering this bug
2020-04-11 02:16:24 +02:00
dpeca
cc8a3e0c58
Correcting FTP link in v-backup-user 2020-04-09 20:53:27 +02:00
Maksim Usmanov | Maks
ce417f65a2
Fix reset password from CLI / roundcube
This will fix bug when change password from cli

$quota is not defined
I not know if there is any function to get quota with a single comand, so I get alredy defined quota

With out this vesta will reset quota or not asign nothing in passwd file when quota password was reset
2020-04-05 13:26:45 +02:00
Clark Chen
7177dbb4e7
Fill missing get data (module) 2020-03-30 16:55:13 +08:00
Clark Chen
e4710ae715
Fix curl call
curl wasn't called properly, due to '&' character exist in url without quote around it
2020-03-30 16:50:07 +08:00
Clark Chen
e75b62efad
Fix curl call
curl wasn't called properly, due to '&' character exist in url without quote around it
2020-03-30 16:48:22 +08:00
dpeca
58807feb80
Adding port to reset password link 2020-03-29 18:13:22 +02:00
dpeca
c915bff32e
Forbid changing root password 2020-03-24 20:40:47 +01:00
dpeca
00e1f46276
Limiting /etc/sudoers for Ubuntu 2020-03-23 19:34:39 +01:00
dpeca
c9844805a4
Limiting /etc/sudoers for Ubuntu 2020-03-23 19:31:42 +01:00
dpeca
c3c4de43d6
Preventing manipulation with $_SERVER['HTTP_HOST'] 2020-03-23 17:28:55 +01:00
dpeca
a5712542d7 Temporary fix for parsing backup conf 2020-03-23 01:21:57 +01:00
olymp
dae2eb0854 Letsencrypt ssl certificate update fails when you have domains like example.com and example.com.ua (beginning matches)
issue #1977 https://github.com/serghey-rodin/vesta/issues/1977
2020-02-23 12:50:32 +02:00
Daniyal Javani
993796fcf2 fix ftp restore path 2020-02-05 10:53:17 +03:30
Josh Marshall
99abd5ed05
Bugfix deleting a PostgreSQL database
Was just a typo
2020-01-09 00:52:10 +10:00
Anton Reutov
931fb5beeb
Merge pull request #1944 from nothinux/i18n-php
update id.php
2019-10-21 13:25:31 +03:00
NIKTONIKTO717
949c011321
Update vst-install-rhel.sh
I only tried to fix bug #1933
2019-10-09 15:23:39 +02:00
David Olsen
9d2ca4b592
Only exclude logs folder from root, not in webdata
Restoring should not exclude logs in any folder down the tree. This causes errors when restoring wordpress with certain plugins that have folders named "logs". This change aligns the restore with the backup function https://github.com/serghey-rodin/vesta/blob/master/bin/v-backup-user#L226

You could also omit the exclusion entirely, as this folder you are excluding should never be in the backup.
2019-10-07 10:40:56 +02:00
dpeca
f0782d1f82
Fixing broken autoreply output
Broken in 0831a198b8 (diff-f07da7937954ae08bdb2e7379655ae29)
@sergio-nadal
2019-10-03 16:15:36 +02:00
Alexandr Loskutov
d0ca10a5d3
Merge pull request #1945 from robindirksen1/patch-7
Update nl.php
2019-10-01 23:52:17 +03:00
Robin Dirksen
ec8631b2d2
Update nl.php 2019-10-01 16:28:03 +02:00
Taufik Mulyana
9947b17144 update id.php 2019-10-01 21:18:38 +07:00
T. Mulyana
6645586fb2
Merge pull request #1 from serghey-rodin/master
update
2019-10-01 20:42:54 +07:00
Serghey Rodin
270d29ff06 added month to the release log date 2019-09-29 00:17:54 +03:00
Serghey Rodin
52c32962a8 Release 0.9.8-26 2019-09-29 00:09:07 +03:00
Serghey Rodin
ae328a0935 added support for HTTP/2 Let's Encrypt servers 2019-09-24 01:08:17 +03:00
dpeca
84ef0a118f
Changing /usr/local/vesta to $VESTA 2019-08-24 16:13:03 +02:00
dpeca
e82ad200b7
Translated added string in sr.php 2019-08-18 16:37:00 +02:00
Serghey Rodin
868dd8b146 Release 0.9.8-25 2019-08-15 21:42:57 +03:00
Serghey Rodin
26c0d3c3f2 fixed delimiter format for plain output 2019-08-08 19:59:21 +03:00
Serghey Rodin
743476ad73 added sudo call for directory creation and restore 2019-08-08 19:58:35 +03:00
Serghey Rodin
015acfc168
Merge pull request #1896 from millsy/master
Switched to egrep to support optional comma in renewal
2019-08-08 14:24:36 +03:00
Serghey Rodin
8728f4b00d deleted merge artifacts 2019-08-08 14:20:35 +03:00
Luka Paunović
02955ddb47 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
25e66d471e Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
b16e9b1d4d Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
6d09433447 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
f23697217b Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
9ab4927ec2 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
ea2f42e689 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
8d3473c914 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
aa8ba1aff1 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
c83a925c9a Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
ed8d38228b Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
0d66d22150 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
bebd854b60 Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
7f8313b48f Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
fe6f93faba Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
57fb5a759f Update config.inc.php 2019-08-08 14:18:31 +03:00
Luka Paunović
cb8cd40b13 Update config.inc.conf 2019-08-08 14:18:31 +03:00
Luka Paunović
a745eb02d8 Update config.inc.conf 2019-08-08 14:18:31 +03:00
Luka Paunović
880496962a Update config.inc.conf 2019-08-08 14:15:57 +03:00
Luka Paunović
3e2178bb6e Update config.inc.conf 2019-08-08 14:15:57 +03:00
Serghey Rodin
9ba24729a6 Merge branch 'lukapaunovic-patch-2' 2019-08-08 14:15:18 +03:00
Serghey Rodin
1a02521f76 Resolved merge conflict with tmp dir. 2019-08-08 14:13:35 +03:00
Serghey Rodin
5c61b3efb1
Merge pull request #1919 from dbannik/fix-add-sftp-backup
fixed add sftp server backup
2019-08-08 14:04:26 +03:00
Serghey Rodin
72fe886a84 Merge branch 'master' of github.com:serghey-rodin/vesta 2019-08-08 13:55:11 +03:00
Serghey Rodin
0340652bf6
Merge pull request #1920 from kovalets/patch-3
Create vsftpd.conf on RHEL 8
2019-08-08 13:53:38 +03:00
Serghey Rodin
b17b4b205d removed unnecessary single quotes for security reasons / thanks to Andrea Cardaci 2019-08-07 18:46:40 +03:00
Serghey Rodin
c9bf443c6a added user format valdation 2019-07-31 00:46:04 +03:00
Serghey Rodin
bb44f4197b hardering user validation 2019-07-30 18:32:30 +03:00
Sergey Kovalets
dbb8b8c674
Create vsftpd.conf 2019-07-26 02:23:40 +03:00
Serghey Rodin
f0b47b3220 rfc2324 partial support: any attempt to brew coffee with a teapot should result in the error code 418 - I'm a teapot 2019-07-22 16:55:55 +03:00
Dmitry Bannik
d74ac9980a
fixed add sftp server backup 2019-07-20 02:39:15 +03:00
Alexandr Loskutov
9de1d46bb6
Merge pull request #1914 from myrevery/patch-1
Update cn.php
2019-07-15 23:22:56 +03:00
myrevery
9c42ce85de
Update cn.php
Refine some details.
2019-07-15 06:17:02 -07:00
Krzysztof Grzelak
a9ddd4159c
Update v-list-web-domain-ssl
Adding certificate support from CloudFlare
2019-07-11 21:30:00 +02:00
Anton Reutov
f9c9ec6fed
Merge pull request #1910 from TimoStramann/patch-2
vBulletin 5 templates added for Debian/Ubuntu
2019-07-04 11:12:16 +03:00
Timo Stramann
ce6640010b
vBulletin 5 template based on default tpl 2019-07-04 02:55:47 +02:00
Timo Stramann
81842cc878
vBulletin 5 template based on default tpl 2019-07-04 02:55:10 +02:00
Timo Stramann
ef36a47ce0
vBulletin 5 template based on default stpl 2019-07-04 02:53:49 +02:00
Timo Stramann
8d83d0235e
vBulletin 5 template based on default tpl 2019-07-04 02:53:03 +02:00
Timo Stramann
de51aa4692
vBulletin 5 template based on default tpl 2019-07-04 02:52:16 +02:00
Timo Stramann
0829d631c9
vBulletin 5 template based on default stpl 2019-07-04 02:47:02 +02:00
Alexandr Loskutov
36c12c618b
Merge pull request #1902 from darkworks/urdu_translation
Update ur.php
2019-06-28 17:32:40 +03:00
Alexandr Loskutov
cbb5356a07
Merge pull request #1898 from myrevery/patch-1
Update cn.php
2019-06-28 17:30:42 +03:00
CLSII
6d6e3f3723
Update v-add-web-domain-ftp
Modification of the useradd request to find the right user group --> For the group it is : (id -g $user)
2019-06-27 21:34:20 +02:00
darkworks
0b0bcf6b15
Use Web Domain SSL Certificate -> ur.php
updated ur.php translation
2019-06-20 23:11:23 +05:00
darkworks
b67c0f88e4
Merge pull request #2 from serghey-rodin/master
update 6 20 2019
2019-06-20 22:30:39 +05:00
darkworks
bf030103da
Merge pull request #1 from darkworks/darkworks-yum_check
check for yum properly.
2019-06-20 22:24:22 +05:00
myrevery
a6028ee4e9
Update cn.php
Refine some details.
2019-06-10 16:10:32 +08:00
Chris Mills
9bceb01622 Switched to egrep to support optional comma in renewal 2019-06-06 06:07:44 +01:00
Serghey Rodin
a6d498e7e2 added net-tools package for ifconfig command 2019-05-23 00:12:42 +03:00
Serghey Rodin
58e9615d94
Merge pull request #1887 from Myself5/master
v-backup-user: Properly fix userdata backup exclusions
2019-05-23 00:08:06 +03:00
Serghey Rodin
7d48d5585f
Merge pull request #1888 from millsy/master
Renewal of cert not removing domain from alias list
2019-05-23 00:04:44 +03:00
Serghey Rodin
c2abcf3dc9
Merge pull request #1892 from romkoll/patch-2
Fix v-unsuspend-mail-account
2019-05-23 00:03:06 +03:00
Serghey Rodin
9c108786e6
Merge pull request #1867 from moucho/domain_idn
Fix Let's Encrypt for IDN domains
2019-05-23 00:02:07 +03:00
Roman
a716a3f2cb
Fix v-unsuspend-mail-account
Fix 'Malformed value "unlimitedM"' after unsuspend mail account
2019-05-22 20:10:15 +03:00
Chris Mills
a78c7ffc92 Renewal of cert not removing domain from alias list 2019-05-17 09:49:58 +01:00
Christian Oder
d24f68a370
v-backup-user: Properly fix userdata backup exclusions
So far, no exclusions have been accounted for as fargs has not been passed.
Rework the logic for fargs parsing based on domain exclusions and pass fargs to the tar command.

Also add --anchored based on 37c69b8f4c
2019-05-15 17:07:53 +02:00
Serghey Rodin
e087a04f00
Merge pull request #1854 from anthonyrossbach/patch-1
Fixes for dumps of large databases
2019-05-14 12:38:21 +03:00
Serghey Rodin
7726ed8956
Merge pull request #1690 from chkhanu/fix-invalid-extension-replace
Fix invalid extension replace in add_web_config
2019-05-14 12:21:14 +03:00
Serghey Rodin
46db88d266
Merge pull request #1885 from noogen/master
fix typo of extra L issue #1509
2019-05-14 12:15:24 +03:00
Serghey Rodin
3e922f8cfe
Merge pull request #1540 from darkworks/darkworks-yum_check
check for yum properly.
2019-05-14 12:11:29 +03:00
noogen
d856c1e080 fix typo of extra L issue #1509 2019-05-14 03:38:36 -05:00
Serghey Rodin
20c7764485
Merge pull request #1575 from moucho/backups
Don't exclude "logs" folder recursively on backups
2019-05-14 11:14:16 +03:00
Serghey Rodin
56ee371a88
Merge pull request #1431 from somthanat/master
#1429 fix php open_basedir error when using public_shtml as a document root
2019-05-14 11:09:48 +03:00
Serghey Rodin
390daf416c
Merge pull request #1463 from serghey-rodin/madeITBelgium-patch-1462
Fix http2 templates #1462
2019-05-14 11:08:25 +03:00
Serghey Rodin
e6cc11a27b
Merge pull request #1454 from EmanH/patch-1
644 chmod should only apply to files
2019-05-14 11:02:18 +03:00
Serghey Rodin
faf7612c7e
Merge pull request #1349 from serghey-rodin/add-caa-record
Add CAA DNS record
2019-05-14 10:57:13 +03:00
Serghey Rodin
1e157d4c29
Merge pull request #1751 from hacktivista/fix/v-update-sys-ip-non-existent-files
Fix v-update-sys-ip: verify if primary IP exists
2019-05-14 10:38:38 +03:00
Serghey Rodin
46d080cd8a
Merge pull request #1750 from hacktivista/fix/debian-chown-admin
Don't chown $VESTA/data/sessions admin:admin previous to user admin creation
2019-05-14 10:36:09 +03:00
Serghey Rodin
63b8ef22f6
Merge pull request #1859 from lukapaunovic/patch-1
Fix for issue #1286
2019-05-14 10:33:55 +03:00
Serghey Rodin
3069003941
Merge pull request #1846 from dreiggy/dreiggy-patch-v-list-mail-domain-dkim-dns-newline-remove
Remove \n from dkim txt output
2019-05-14 10:30:55 +03:00
Serghey Rodin
0f08d77fd5
Merge pull request #1858 from SteenSchutt/master
Prevent v-backup-user from excluding folders named logs further down the tree
2019-05-14 10:28:05 +03:00
Serghey Rodin
855ba537cd
Merge pull request #1838 from pablobae/br2-fix-firewall-update-check-ssh-custom-port-rules-config-file
Update v-update-firewall
2019-05-14 10:26:04 +03:00
Serghey Rodin
d4bde98d2e
Merge pull request #1862 from noogen/master
fix typo and allow user to login on pgsql restore
2019-05-14 10:24:18 +03:00
Serghey Rodin
7f82e42cc2
Merge pull request #1870 from skullwritter/patch-11
correcting wildcat
2019-05-14 10:23:33 +03:00
Serghey Rodin
e57f620a86
Merge pull request #1875 from serghey-rodin/Skamasle-patch-6
Fix Nginx exclusion
2019-05-14 10:20:26 +03:00
Serghey Rodin
8dd0ef30fe
Merge pull request #1876 from serghey-rodin/Skamasle-patch-7
Fix for nginx exclude
2019-05-14 10:20:08 +03:00
Serghey Rodin
698f9783b4
Merge pull request #1884 from pasuder/master
Fix update of SSL for LetsEncrypt certs
2019-05-14 10:18:42 +03:00
Paweł Suder
d563dcd12b Fix update of SSL for LetsEncrypt certs
Due to missing /g in sed for parsing aliases from certificate SAN
field there was an issue with doubled alias which is also common
name of issued certficiate.
2019-05-14 08:59:43 +02:00
Serghey Rodin
f50d8b7d84 added port 654321 to run openssl key-pair test 2019-05-08 22:47:30 +03:00
Maksim Usmanov | Maks
3acd228169
Fix for nginx exclude
There are some ways to fix this

First put nginx at the beginig or modify this line

software=$(echo "$software" | sed -e "s/^nginx//")
Replacing it by this one:
software=$(echo "$software" | sed -e "s/nginx//")
Or by this:
software=$(echo "$software" | sed -e "s/ nginx//")
2019-04-28 16:03:54 +02:00
Maksim Usmanov | Maks
a62095aa13
Fix Nginx exclusion
This fix 706 in bugs.vesta and #1820 ( same issue )
2019-04-28 15:57:49 +02:00
Skull Writter
f492c1ee2a
correcting wildcat
check if alias is the letsencrypt wildcard domain, if not, make the normal checks
2019-04-23 14:11:31 +00:00
Anton Reutov
0031c93535
Merge pull request #1865 from sergio-nadal/security-fixes
Security fixes - CSRF / Command Injection / XSS
2019-04-22 19:48:00 +03:00
Anton Reutov
9b5ac54d93
Merge pull request #1868 from moucho/spanish
Updated Spanish translation
2019-04-22 15:50:23 +03:00
moucho
5df4dc819f Updated Spanish translation 2019-04-22 14:47:32 +02:00
moucho
0713570b87 Fix Let's Encrypt for IDN domains 2019-04-21 18:28:34 +02:00
Sergio
7226a8991f Fix some XSS. 2019-04-21 02:18:24 +02:00
Sergio
0831a198b8 Fixed several Command Injection. 2019-04-21 01:51:29 +02:00
Sergio
7603cdea7a Add the validation of the CSRF token. It is missing in some cases when it is sent by GET or POST. 2019-04-21 00:11:36 +02:00
Anton Reutov
2da2c539f1
Merge pull request #1864 from moucho/Spanish
Spanish translation update
2019-04-20 15:00:20 +03:00
moucho
97a3b40047 Spanish translation update 2019-04-20 13:47:38 +02:00
Serghey Rodin
af37f5cbef fix backport apt name 2019-04-20 03:07:10 +03:00
Serghey Rodin
35df8ba980 Jessie backports 2019-04-20 00:08:37 +03:00
Serghey Rodin
82b635f8da Print the file name for each match 2019-04-18 15:03:03 +03:00
Serghey Rodin
25706abfb3 replaced rdomain with domain variable 2019-04-17 23:28:40 +03:00
Serghey Rodin
425e9f2483 18$ instead of 21$ 2019-04-16 12:53:58 +03:00
Serghey Rodin
bef5f87618 version up 2019-04-16 12:16:03 +03:00
noogen
483c4b943b fix typo and allow user to login on pgsql restore 2019-04-15 17:29:31 -05:00
Serghey Rodin
703a66eb57 gzip_vary duplicate 2019-04-15 21:00:12 +03:00
Serghey Rodin
e1fb811caf ubuntu 18.10 support 2019-04-15 14:08:16 +03:00
Serghey Rodin
e674bf14fd Release 0.9.8-24 2019-04-15 13:48:23 +03:00
Serghey Rodin
70319b6a94 full pma install 2019-04-15 13:33:09 +03:00
Serghey Rodin
ab95d5d88d removing single quote from escapeshellarg calls 2019-04-15 10:51:40 +03:00
Serghey Rodin
c28c5d29a3 setting content type to fix possible XSS attack vector 2019-04-12 17:21:28 +03:00
Luka Paunović
f0c328375f
Update v-change-sys-service-config 2019-04-11 19:02:36 +02:00
Luka Paunović
3cbaab38bf
Fix for issue #1286
Fix for issue #1286
2019-04-11 19:00:56 +02:00
Steen Schütt
b650ae5bd5
Merge pull request #1 from SteenSchutt/SteenSchutt-patch-1
Prevent v-backup-user from excluding folders named logs further down …
2019-04-10 14:43:46 +02:00
Steen Schütt
a981ddb468
Prevent v-backup-user from excluding folders named logs further down the tree
This change will fix issues with files like `public_html/wp-content/plugins/sitepress-multilingual-cms/classes/logs/interface-wpml-log.php` from being excluded, but still exclude the intended main logs directory. Fixes a semi-widespread issue with VestaCP and WPML.
2019-04-10 14:42:10 +02:00
Anthony Rossbach
8f2fdfb8d3
Fixes for dumps of large databases 2019-04-08 21:47:22 -07:00
Anton Reutov
576a0003da
Merge pull request #1850 from myrevery/patch-1
Update cn.php
2019-03-31 12:16:00 +03:00
myrevery
a181433231
Update cn.php
Refine some details.
Format code and translate new keywords.
2019-03-31 05:50:02 +08:00
Olgerdas
a420465b39
Remove \n from dkim txt output
Some DNS providers (like cloudflare) do not allow in dkim txt record \n char. Fix is removing new line symbols (\n).
2019-03-27 19:35:10 +02:00
Anton Reutov
2bde9c6e47
Merge pull request #1841 from lukapaunovic/patch-1
Fixing blowfish_secret length (too short) [phpMyAdmin]
2019-03-23 15:01:44 +03:00
Luka Paunović
891dac76fc
Update vst-install-rhel.sh 2019-03-21 21:26:05 +01:00
Luka Paunović
a67674c1f2
Fixed
fixed
2019-03-21 21:25:27 +01:00
Luka Paunović
5d9265f84f
Fixing blowfish_secret length (too short)
Fixing blowfish_secret length (too short)
2019-03-21 16:52:59 +01:00
Luka Paunović
aeee40865e
Fixing blowfish_secret length (too short)
phpMyAdmin "screams", we should be using length of 32 characters for blowfish_secret.
2019-03-21 16:50:29 +01:00
Anton Reutov
678c385a81
Merge pull request #1549 from asfihani/master
Add Wordpress WP Super Cache plugin template support
2019-03-20 12:46:38 +03:00
Anton Reutov
1637f737e1
Merge pull request #1711 from clarkchentw/patch-2
Traditional Chinese - TW, update to match en.php
2019-03-20 12:44:20 +03:00
Anton Reutov
90b30a437b
Merge pull request #1683 from crackerizer/drupal-nginx
Reworked on Drupal's nginx template
2019-03-20 12:41:55 +03:00
pablobae
1f40804735 Update v-update-firewall
Check sshcustom port  is not needed anymore, because after merging pull 1819, the rules file already contains the ssh port correctly (it's not hardcoded anymore.

Also, if these lines are not removed, we have change ssh port, and we try to add a new rule with port 22 (v-add-firewall-rule DROP 0.0.0.0/0 22 tcp ssh) , these lines will change port 22 to current ssh port on rules.conf file, and we will be blocked.
2019-03-14 16:07:44 +01:00
Serghey Rodin
180d910131 inverted trigger condition 2019-03-14 14:58:19 +02:00
Serghey Rodin
6a9b7d3507 Use Web Domain SSL Certificate -> i18n 2019-03-14 14:34:38 +02:00
Serghey Rodin
80ebfc0daa frontend: user domain vesta ssl certificate support 2019-03-14 00:44:32 +02:00
Serghey Rodin
8edf965375 backend: user domain vesta ssl certificate support 2019-03-14 00:44:06 +02:00
Anton Reutov
f456afec60
Merge pull request #1835 from myrevery/patch-1
Update cn.php
2019-03-11 13:12:53 +03:00
myrevery
2959165e1a
Update cn.php
Refine some details.
2019-03-11 06:43:33 +08:00
Serghey Rodin
c1b775443d added scripts to copy web domain ssl to vesta and exim 2019-03-03 23:25:16 +02:00
dpeca
eb03d7bab2
Added unzip to Debian installer
Needed for FileManager
2019-03-02 23:24:02 +01:00
Serghey Rodin
c5cff5bcd6 Merge branch 'master' of github.com:serghey-rodin/vesta 2019-02-28 23:47:18 +02:00
Serghey Rodin
a7b54d6000 Function to search avaiable SSL certificates that could be used as main cert 2019-02-28 23:47:07 +02:00
Anton Reutov
66473a41d9
Merge pull request #1819 from pablobae/pablobae-patch1
Update v-add-firewall-chain getting ssh port from ssh config file (not hardcoded)
2019-02-28 23:02:59 +03:00
Anton Reutov
ae1ec05e66
fix for the use of a deprecated directive in nginx 2019-02-28 15:25:54 +03:00
Anton Reutov
452a7ad62e
fix for the use of a deprecated directive in nginx 2019-02-28 15:25:48 +03:00
Anton Reutov
12bc7ab544
fix for the use of a deprecated directive in nginx 2019-02-28 15:25:42 +03:00
Anton Reutov
b7a2728ab0
fix for the use of a deprecated directive in nginx 2019-02-28 15:25:40 +03:00
Anton Reutov
12fdd9713e
fix for the use of a deprecated directive in nginx 2019-02-28 15:24:14 +03:00
Anton Reutov
3912de3ed0
fix for the use of a deprecated directive in nginx 2019-02-28 15:23:55 +03:00
Anton Reutov
b3b1ec3c2e
fix for the use of a deprecated directive in nginx 2019-02-28 15:23:50 +03:00
Anton Reutov
4d5ecf05e7
fix for the use of a deprecated directive in nginx 2019-02-28 15:23:46 +03:00
Anton Reutov
d353421ff4
fix for the use of a deprecated directive in nginx 2019-02-28 15:22:28 +03:00
Anton Reutov
20027824cf
fix for the use of a deprecated directive in nginx 2019-02-28 15:22:17 +03:00
Anton Reutov
eae7202f52
fix for the use of a deprecated directive in nginx 2019-02-28 15:22:09 +03:00
Anton Reutov
caf0890ca1
fix for the use of a deprecated directive in nginx 2019-02-28 15:22:01 +03:00
Anton Reutov
c1d1f13a04
fix for the use of a deprecated directive in nginx 2019-02-28 15:20:06 +03:00
Anton Reutov
a38770a081
fix for the use of a deprecated directive in nginx 2019-02-28 15:19:47 +03:00
Anton Reutov
470b88c764
fix for the use of a deprecated directive in nginx 2019-02-28 15:19:32 +03:00
Anton Reutov
a90c85e6b5
fix for the use of a deprecated directive in nginx 2019-02-28 15:18:46 +03:00
Anton Reutov
f85989fdbf
fix for the use of a deprecated directive in nginx 2019-02-28 15:18:03 +03:00
Anton Reutov
4a04783d66
fix for the use of a deprecated directive in nginx 2019-02-28 15:15:20 +03:00
Anton Reutov
b1e826b0a6
fix for the use of a deprecated directive in nginx 2019-02-28 15:15:03 +03:00
Anton Reutov
19bd87334b
fix for the use of a deprecated directive in nginx 2019-02-28 15:14:51 +03:00
Anton Reutov
e39623308e
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:53 +03:00
Anton Reutov
c11a1b165b
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:49 +03:00
Anton Reutov
579ed37114
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:48 +03:00
Anton Reutov
49ab4c345c
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:45 +03:00
Anton Reutov
00ab9be534
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:43 +03:00
Anton Reutov
a4b8ebcf88
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:41 +03:00
Anton Reutov
cd3ccf5370
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:38 +03:00
Anton Reutov
5230c3d3b0
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:35 +03:00
Anton Reutov
bbf745e049
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:31 +03:00
Anton Reutov
8cbba0ed3e
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:29 +03:00
Anton Reutov
1ede3c055c
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:26 +03:00
Anton Reutov
c28167f37a
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:24 +03:00
Anton Reutov
cf2dc9ccbd
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:20 +03:00
Anton Reutov
6c6520a18c
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:16 +03:00
Anton Reutov
ada32d5535
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:11 +03:00
Anton Reutov
1806c2a3d6
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:09 +03:00
Anton Reutov
dca488c0f7
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:06 +03:00
Anton Reutov
58ddfd4b4d
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:04 +03:00
Anton Reutov
f64e745e20
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:02 +03:00
Anton Reutov
8ef8d8b722
fix for the use of a deprecated directive in nginx 2019-02-28 15:05:00 +03:00
Anton Reutov
d449784697
fix for the use of a deprecated directive in nginx 2019-02-28 15:04:58 +03:00
Anton Reutov
68230531b3
fix for the use of a deprecated directive in nginx 2019-02-28 15:04:53 +03:00
Anton Reutov
37acc7bf31
fix for the use of a deprecated directive in nginx 2019-02-28 15:04:49 +03:00
Anton Reutov
faa9d4aa62
fix for the use of a deprecated directive in nginx 2019-02-28 15:04:45 +03:00
Anton Reutov
75283ef755
fix for the use of a deprecated directive in nginx 2019-02-28 14:50:10 +03:00
Anton Reutov
b289a46cfb
fix for the use of a deprecated directive in nginx 2019-02-28 14:50:05 +03:00
Anton Reutov
4f086744be
fix for the use of a deprecated directive in nginx 2019-02-28 14:50:00 +03:00
Anton Reutov
40a8461b28
fix for the use of a deprecated directive in nginx 2019-02-28 14:49:56 +03:00
Anton Reutov
f36148ca01
fix for the use of a deprecated directive in nginx 2019-02-28 14:47:36 +03:00
Anton Reutov
0226e7b862
fix for the use of a deprecated directive in nginx 2019-02-28 14:47:33 +03:00
Anton Reutov
064a16043d
fix for the use of a deprecated directive in nginx 2019-02-28 14:47:31 +03:00
Anton Reutov
48f61fcc2c
fix for the use of a deprecated directive in nginx 2019-02-28 14:47:29 +03:00
Anton Reutov
3188ae9999
fix for the use of a deprecated directive in nginx 2019-02-28 14:42:44 +03:00
Anton Reutov
01d9626b6c
fix for the use of a deprecated directive in nginx 2019-02-28 14:42:38 +03:00
Anton Reutov
3ed733669e
fix for the use of a deprecated directive in nginx 2019-02-28 14:41:55 +03:00
Anton Reutov
4ed0ca484c
fix for the use of a deprecated directive in nginx 2019-02-28 14:41:35 +03:00
Anton Reutov
dc3dec644d
fix for the use of a deprecated directive in nginx 2019-02-28 14:40:06 +03:00
Anton Reutov
6bb56a8742
fix for the use of a deprecated directive in nginx 2019-02-28 14:39:37 +03:00
Anton Reutov
5ea43b6df6
fix for the use of a deprecated directive in nginx 2019-02-28 14:39:05 +03:00
Anton Reutov
7a1cdc689e
fix for the use of a deprecated directive in nginx 2019-02-28 14:13:15 +03:00
Anton Reutov
232dbf0d09
fix for the use of a deprecated directive in nginx 2019-02-28 14:11:55 +03:00
Anton Reutov
5b4d89b47f
fix for the use of a deprecated directive in nginx 2019-02-28 14:11:21 +03:00
Anton Reutov
6a5061a7a9
fix for the use of a deprecated directive in nginx 2019-02-28 14:11:03 +03:00
Anton Reutov
7aa71c6ca0
fix for the use of a deprecated directive in nginx 2019-02-28 14:10:11 +03:00
Anton Reutov
b22802478d
fix for the use of a deprecated directive in nginx 2019-02-28 14:07:33 +03:00
Anton Reutov
21ce107c68
fix for the use of a deprecated directive in nginx 2019-02-28 14:07:07 +03:00
Anton Reutov
edb3fcc2df
fix for the use of a deprecated directive in nginx 2019-02-28 14:06:25 +03:00
Anton Reutov
372770931c
fix for the use of a deprecated directive in nginx 2019-02-28 14:05:12 +03:00
Anton Reutov
a09f097b3b
Merge pull request #1810 from ifaist0s/master
Proposed fix for the use of a deprecated directive in nginx
2019-02-28 13:54:13 +03:00
Serghey Rodin
f4d3f7a85f Full PMA&Roundcube installs + dovecot namespace hotfix 2019-02-27 14:03:51 +02:00
Serghey Rodin
090875a173 Merge branch 'master' of github.com:serghey-rodin/vesta 2019-02-27 13:56:14 +02:00
Anton Reutov
43fe755f0b
Merge pull request #1822 from fifi/fix-german-translation
fix german translation, forwarded mail
2019-02-25 22:36:02 +03:00
Anton Reutov
ba6491b23f
Merge pull request #1815 from mdandidarmawan/master
Fixing Typo error on Lets Encrypt validation
2019-02-25 17:21:15 +03:00
Anton Reutov
b510f55e88
a new pricing for FileManager & SFTP chroot plugin
a new pricing for FileManager & SFTP chroot plugin
2019-02-25 16:08:40 +03:00
Serghey Rodin
bf5aa0fd6e auto subscribe mail dirs 2019-02-23 11:30:28 +02:00
Serghey Rodin
d05a02e0b6 hotfix for dovecot namespace on ubuntu 18.04 2019-02-21 15:56:34 +02:00
Serghey Rodin
561d7e9f01 force flag isn't required when admin group exists since it's there by default 2019-02-20 18:01:06 +02:00
Serghey Rodin
7d11db2dd2 Merge branch 'master' of github.com:serghey-rodin/vesta 2019-02-20 15:51:04 +02:00
Roman
e0a3439415 fix backend_template save after package change 2019-02-20 05:00:59 +02:00
dpeca
d15e103704
Allow admins to run custom script after SSL is put to any domain
Useful if you have separated SSLs for each IP address.

If admin add to vesta.conf this:
UPDATE_SSL_SCRIPT='/usr/local/bin/update_ssl_script.sh'
that script will be called after each domain get new SSL or renew old SSL.

Then admin can write custom script that will, for example, copy new SSL to some file that is needed for dovecot or exim, for example...
Passed parameters are $user and $domain ($1 and $2), so custom script can check what domain got new SSL, and then to run custom task...
2019-02-14 18:29:56 +01:00
Serghey Rodin
6b2f651418 protection in case there are two or more ips with the same nat association 2019-02-14 17:47:58 +02:00
Serghey Rodin
0d9218e9fc in case there is no conf 2019-02-14 13:24:18 +02:00
Marcus Viefeld
bad8ee8042 fix german translation, forwarded mail 2019-02-14 05:41:16 +01:00
Alexandr Loskutov
3c8c2f2cfb
Merge pull request #1821 from RJuho/finnish_translation
Finnish translation update
2019-02-12 23:28:36 +02:00
Juho Räsänen
1725a61491 Finnish translation updated and some changes
New strings translated and some small changes.
2019-02-12 22:05:47 +02:00
Juho Räsänen
d60c2655ec
Merge pull request #1 from serghey-rodin/master
Bringing fork up to date
2019-02-12 22:01:27 +02:00
Alexandr Loskutov
0bb74cd2bb
Merge pull request #1818 from devius/patch-3
Add missing translations
2019-02-09 20:32:32 +02:00
pablobae
d334ddc501
Update v-add-firewall-chain
Obtains the SSH port from the service configuration file (originally it was hardcoded). This allow the correct creation of ssh chain when this service has a custom port.
2019-02-07 16:49:43 +01:00
devius
2d96e3631f
Add missing translations
I have found and translated last missing Georgian versions for strings
2019-02-06 17:23:58 +04:00
Dandi Darmawan
c1fc0208f7
Fixing Typo
check_result $E_CONNECT "Let's Encrypt vvalidation status $status"  > check_result $E_CONNECT "Let's Encrypt validation status $status"
2019-01-24 18:16:01 +07:00
ifaist0s
6c072a91c4
Use of deprecated directive
FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913
2019-01-22 12:59:33 +02:00
ifaist0s
a72ecfbcfb
Use of deprecated directive
FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913
2019-01-22 12:58:48 +02:00
ifaist0s
45a6824990
Use of deprecated directive
FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913
2019-01-22 12:52:36 +02:00
ifaist0s
18ec586831
Use of deprecated directive
FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913
2019-01-22 12:51:59 +02:00
cmstew
7f833efcde
Update vst-install-amazon.sh
apparently the /var/run/clamav folder is still required for the sock file
2019-01-05 13:08:59 -07:00
cmstew
3881e36967
Update vst-install-amazon.sh
Keep /etc/clamd.conf as main file and link to it instead of using /etc/clamd.d/scan.conf.
2019-01-05 13:02:23 -07:00
cmstew
9f671ccf90
Update vst-install-amazon.sh
- Cleaned up changes
- Removed unnecessary clamd code from Centos installer
2019-01-02 08:18:06 -07:00
cmstew
be300fd82e
Update vst-install-rhel.sh
Changed hostname variable to match rest of script
2019-01-01 12:07:49 -07:00
cmstew
5852424830
Update vst-install-amazon.sh
Changed hostname variable to match rest of script
2019-01-01 12:07:43 -07:00
cmstew
bdb0959e1b
Update vst-install-debian.sh
Changed hostname variable to match rest of script
2019-01-01 12:07:34 -07:00
cmstew
d8f372d99c
Update vst-install-ubuntu.sh
Changed hostname variable to match rest of script
2019-01-01 12:07:30 -07:00
cmstew
3b58b4a8b7
Update vst-install-ubuntu.sh
missed a change
2018-12-31 19:10:18 -07:00
cmstew
c79785c790
Update vst-install-debian.sh
missed a change
2018-12-31 19:10:11 -07:00
cmstew
13e2f473e2
Update vst-install-amazon.sh
missed a change
2018-12-31 19:10:05 -07:00
cmstew
f8734d15e9
Update vst-install-ubuntu.sh
- Added to help function for ssl
- Added argument for enabling Let's Encrypt SSL
- Added set_default_value 'ssl' 'no'
- Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes'
2018-12-31 15:48:29 -07:00
cmstew
7c9afbca32
Update vst-install-debian.sh
- Added to help function for ssl
- Added argument for enabling Let's Encrypt SSL
- Added set_default_value 'ssl' 'no'
- Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes'
2018-12-31 15:48:25 -07:00
cmstew
1dae236693
Update vst-install-amazon.sh
- Added to help function for ssl
- Added argument for enabling Let's Encrypt SSL
- Added set_default_value 'ssl' 'no'
- Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes'
2018-12-31 15:48:18 -07:00
cmstew
6689e5c839
Update vst-install-rhel.sh
- Added to help function for ssl
- Added argument for enabling Let's Encrypt SSL
- Added set_default_value 'ssl' 'no'
- Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes'
2018-12-31 15:42:01 -07:00
cmstew
fb13db40ce
Update vst-install-amazon.sh
cleaned up changes for clamd on amazon linux
2018-12-29 12:47:58 -07:00
cmstew
57429a3203
Update vst-install-amazon.sh
Added backup of /etc/clamd.d/scan.conf after installing clamd because the file is not there before.
2018-12-28 15:59:21 -07:00
cmstew
b1e0e6a2a5
Fix clamd for Amazon Linux 2018-12-28 14:57:38 -07:00
cmstew
8d48fca193
Added clamd.scan 2018-12-28 13:53:19 -07:00
cmstew
041fd2914f
Create clamd.scan index page 2018-12-28 13:51:41 -07:00
dpeca
0d85c88d18
Bringing back Better handling of calm-down routine while LE renewing
Accidentally overwritten in f8b4d42b74 commit
Original commit: 3d8b6a87a7

Calming down is because https://github.com/serghey-rodin/vesta/issues/1193 issue
2018-12-27 21:10:17 +01:00
dpeca
8010f5d802
CentOS7: Register /sbin/nologin and /usr/sbin/nologin
Fix for https://github.com/serghey-rodin/vesta/issues/1437
2018-12-27 20:56:14 +01:00
Serghey Rodin
f8b4d42b74 Let's Encrypt v2 with wildcard support 2018-12-26 12:54:33 +02:00
Marcos
635107b804 Merge branch 'backups' of github.com:moucho/vesta into backups 2018-12-24 17:51:15 +01:00
Marcos
49f69ce60d Fix conflicts 2018-12-24 17:51:07 +01:00
Marcos
daa33140f4
Merge branch 'master' into backups 2018-12-24 17:46:08 +01:00
Marcos
73cb7667cd Fix conflict 2018-12-24 17:44:23 +01:00
dpeca
4327a3d1bc
Syntax error fix in v-add-letsencrypt-user 2018-12-21 17:28:12 +01:00
Henri Hulski
95a345f2dc Increment backend port also when commented
This allows to grep the incremented port also for other backends then php-fpm with `%backend_lsnr%` in the web template.
2018-12-17 19:41:37 +01:00
Maxim Nosovets
cb67641bed Check missing 'gnupg' package on latest fresh Ubuntu versions 2018-12-14 15:20:14 +02:00
dpeca
3d8b6a87a7
Better handling of calm-down routine while LE renewing
Sleep is because https://github.com/serghey-rodin/vesta/issues/1193
2018-12-10 14:31:10 +01:00
dpeca
58c6ca95b1
Fix for suspended domain checking while LE renewing
Logic should be inversed...
If you grep for suspended=no, then variable is NOT empty if it's NOT suspended
Which means it's empty only if it's suspended.
So we must grep for suspended=yes if we consider not-empty result as suspended domain.
@skullwritter 

This bug totally brakes LE renewing :)
2018-12-10 14:15:46 +01:00
JOduMonT
965e23f30c template for mautic 2018-12-05 07:29:14 +01:00
JOduMonT
dccd29f455 add template for invoice ninja 2018-12-05 07:02:13 +01:00
Serghey Rodin
320455f7c9 ACME v2 support - list user/ typo 2018-12-04 16:30:42 +02:00
Serghey Rodin
d2d399676f ACME v2 support - list user 2018-12-04 16:27:22 +02:00
Serghey Rodin
41bfca0b21 ACME v2 support 2018-12-04 16:21:46 +02:00
Anton Reutov
9f9ee14559
Change monthly price for File Manager and SFTP 2018-11-30 17:29:33 +02:00
Anton Reutov
2d0e09e7ca
Azerbaijani language support 2018-11-30 00:55:27 +02:00
Anton Reutov
44eabb4e9d
Azerbaijani language support 2018-11-30 00:54:45 +02:00
Anton Reutov
c29c7cc8e6
Azerbaijani language support 2018-11-30 00:52:49 +02:00
Anton Reutov
2a8188a207
Create az.php
Azerbaijani language support
2018-11-30 00:44:32 +02:00
Serghey Rodin
59695acd10 universe repository check 2018-11-29 13:40:15 +02:00
Serghey Rodin
6b590a6c93 New version of Softaculous: 5.1.2 2018-11-27 15:30:59 +02:00
Anton Reutov
6a8f77db18
Merge pull request #1696 from prodimon/bugfix-nginx-templates
bugfix nginx templates
2018-11-25 01:51:14 +02:00
Anton Reutov
46bfba0cae
Merge pull request #1721 from moucho/suspend_mail_domain
Suspend Domain Alert wrong
2018-11-24 23:06:58 +02:00
Anton Reutov
15a6808733
Merge pull request #1733 from skullwritter/patch-8
supose fix to #1526
2018-11-24 22:44:48 +02:00
Anton Reutov
c5ba8b5b65
Update v-update-user-counters 2018-11-24 22:43:21 +02:00
Anton Reutov
e1ca04c77c
Merge pull request #1666 from prodimon/fix-tar-exclude-folder
Fix editing backup exclusions
2018-11-23 17:45:19 +02:00
Anton Reutov
04e4b37f01
Merge pull request #1781 from serghey-rodin/madeITBelgium-patch-6
Fix quotes in cronjob CMD
2018-11-23 13:34:00 +02:00
Made I.T
aa83fa85f8
Fix quotes in cronjob CMD 2018-11-22 10:19:23 +01:00
Dmitry Bannik
eb29a1f374
Merge branch 'master' into fix-tar-exclude-folder 2018-11-21 04:46:41 +03:00
Serghey Rodin
00bc162fe6 removed duplicate loop 2018-11-20 11:20:21 +02:00
Serghey Rodin
0437c4ac3e fix backup exlustions for files 2018-11-14 17:53:48 +02:00
dpeca
2044890bae
Merge pull request #1776 from lukapaunovic/patch-44
Update nginx.conf
2018-11-14 13:08:29 +01:00
dpeca
8c52faab65
Merge pull request #1775 from lukapaunovic/patch-38
Update nginx.conf
2018-11-14 13:08:13 +01:00
dpeca
64ad51376d
Merge pull request #1774 from lukapaunovic/patch-42
Update nginx.conf
2018-11-14 13:07:57 +01:00
dpeca
784f075fa8
Merge pull request #1773 from lukapaunovic/patch-41
Update nginx.conf
2018-11-14 13:07:29 +01:00
dpeca
1369a12204
Merge pull request #1772 from lukapaunovic/patch-40
Update nginx.conf
2018-11-14 13:07:03 +01:00
dpeca
a697ae70f6
Merge pull request #1771 from lukapaunovic/patch-39
Update nginx.conf
2018-11-14 13:06:41 +01:00
dpeca
0a9aaa1042
Merge pull request #1770 from lukapaunovic/patch-37
Update nginx.conf
2018-11-14 13:05:45 +01:00
dpeca
59f29ce2f3
Merge pull request #1769 from lukapaunovic/patch-36
Update nginx.conf
2018-11-14 13:05:23 +01:00
dpeca
768df7293d
Merge pull request #1768 from lukapaunovic/patch-35
Update nginx.conf
2018-11-14 13:04:15 +01:00
dpeca
995f9f8eba
Merge pull request #1767 from lukapaunovic/patch-34
Update nginx.conf
2018-11-14 13:03:32 +01:00
dpeca
c8039a8ed9
Merge pull request #1766 from lukapaunovic/patch-33
Update nginx.conf
2018-11-14 13:03:02 +01:00
dpeca
ff0e5a00d4
Merge pull request #1765 from lukapaunovic/patch-32
Update nginx.conf
2018-11-14 13:02:45 +01:00
dpeca
05d77009e3
Merge pull request #1764 from lukapaunovic/patch-31
Update nginx.conf
2018-11-14 13:02:27 +01:00
dpeca
4edcd354ae
Merge pull request #1763 from lukapaunovic/patch-30
Update nginx.conf
2018-11-14 13:02:02 +01:00
dpeca
483c4b6c7a
Merge pull request #1762 from lukapaunovic/patch-29
Update nginx.conf
2018-11-14 13:01:38 +01:00
dpeca
12e1c00806
Merge pull request #1761 from lukapaunovic/patch-28
Update nginx.conf
2018-11-14 13:01:11 +01:00
dpeca
37a2216c74
Merge pull request #1777 from lukapaunovic/patch-43
Update nginx.conf
2018-11-14 13:00:48 +01:00
dpeca
d38c252089
Merge pull request #1760 from lukapaunovic/patch-26
vary
2018-11-14 12:59:51 +01:00
dpeca
b8ae9fc2bd
Merge pull request #1759 from lukapaunovic/patch-27
Update nginx.conf
2018-11-14 12:59:27 +01:00
Luka Paunović
e672970103
Update nginx.conf
vary on
2018-11-14 00:25:12 +01:00
Luka Paunović
c82e50056d
Update nginx.conf
vary on
2018-11-14 00:24:58 +01:00
Luka Paunović
13d713ecc8
Update nginx.conf 2018-11-14 00:24:42 +01:00
Luka Paunović
0f1fb8aa43
Update nginx.conf 2018-11-14 00:24:25 +01:00
Luka Paunović
d6e0b4e18f
Update nginx.conf
vary on
2018-11-14 00:24:17 +01:00
Luka Paunović
936b225b30
Update nginx.conf
vary on
2018-11-14 00:24:02 +01:00
Luka Paunović
ccc4e5a262
Update nginx.conf
vary on
2018-11-14 00:23:45 +01:00
Luka Paunović
ef422f62f6
Update nginx.conf
vary on
2018-11-14 00:23:19 +01:00
Luka Paunović
46b7d8438f
Update nginx.conf
vary on
2018-11-14 00:23:06 +01:00
Luka Paunović
433166a477
Update nginx.conf
vary on
2018-11-14 00:22:32 +01:00
Luka Paunović
61c439554e
Update nginx.conf
vary on
2018-11-14 00:21:38 +01:00
Luka Paunović
151f82e519
Update nginx.conf
vary on
2018-11-14 00:21:12 +01:00
Luka Paunović
4073325014
Update nginx.conf
vary on
2018-11-14 00:20:21 +01:00
Luka Paunović
812e001723
Update nginx.conf
vary on
2018-11-14 00:18:06 +01:00
Luka Paunović
49cf569729
Update nginx.conf
vary on
2018-11-14 00:17:31 +01:00
Luka Paunović
4d70c416ca
Update nginx.conf
vary on
2018-11-14 00:17:02 +01:00
Luka Paunović
a3982fd477
Update nginx.conf
vary on
2018-11-14 00:16:24 +01:00
Luka Paunović
591bfdaad1
Update nginx.conf 2018-11-14 00:14:39 +01:00
Luka Paunović
e799566c6b
vary
vary, causes page speed issues
2018-11-14 00:14:04 +01:00
dpeca
f64909e9a9
Merge pull request #1749 from serghey-rodin/madeITBelgium-patch-5
Fix default www & edit alias
2018-11-10 20:48:28 +01:00
Hacktivista
9abd3baf2e Fix v-update-sys-ip: verify if primary IP exists
Fixes the following errors on new installations:

> mv: cannot move '/usr/local/vesta/data/ips/' to a subdirectory of itself, '/usr/local/vesta/data/ips/x.x.x.x'
> sed: can't read /usr/local/vesta/data/users/*/dns/*.conf: No such file or directory
> sed: -e expression #1, char 0: no previous regular expression
> sed: -e expression #1, char 0: no previous regular expression
2018-11-09 20:02:47 -03:00
Hacktivista
0760e6a2e6 Don't chown $VESTA/data/sessions admin:admin previous to user admin creation
Fixes `chown: invalid user: 'admin:admin'` on Debian installations, line not present in other distros install scripts
2018-11-09 20:01:10 -03:00
dpeca
b9210522f5
Ubuntu 18.04 dovecot namespace inbox fix
Fix based on https://github.com/serghey-rodin/vesta/pull/1669/files
2018-11-09 17:47:05 +01:00
dpeca
e92d7a0960
Merge pull request #1669 from luizjrdeveloper/master
Fix Dovecot Connection
2018-11-09 17:37:49 +01:00
Made I.T
2dc406aae4
Fix dubble www 2018-11-08 16:33:34 +01:00
Made I.T
381bc48e96
Fix dubble www 2018-11-08 16:32:31 +01:00
dpeca
2996b8afc8
Merge pull request #1734 from skullwritter/patch-9
Fix for LE renewal if domain is suspended
2018-11-07 20:47:10 +01:00
Alexandr Loskutov
c32fa673e1 Fix Dovecot namespace inbox=yes for CentOS 7
Co-Authored-By: dpeca <dpeca@users.noreply.github.com>
2018-11-04 08:21:36 +02:00
dpeca
5170e5f5aa
Dovecot fix namespace inbox=yes only for Debian9 2018-11-04 03:35:17 +01:00
Alexandr Loskutov
8a1f8349ec
Merge pull request #1747 from tomivs/spanish-translation
Spanish translation improvements
2018-10-31 23:00:51 +02:00
dpeca
f9a15564e2
Escaping quotas in JSON output of v-list-web-domain-ssl 2018-10-31 17:07:01 +01:00
Tomás Vielma
6a753f65f2 Spanish translation improvements 2018-10-31 10:29:25 -04:00
Skull Writter
fa331e6ef2
removed dns and mail support - checking le 2018-10-30 16:25:24 -01:00
dpeca
76319e5a1b
Avoid user backup if user is not created from Vesta 2018-10-28 03:29:50 +01:00
dpeca
5ab9fc5f4a
Avoid user stats for the user that is not created from Vesta 2018-10-28 00:31:34 +02:00
dpeca
21dd9fae6d
Avoid listing user that is not created from Vesta 2018-10-28 00:23:12 +02:00
dpeca
32e970d111
Fix for dovecot namespace inbox=yes 2018-10-26 18:02:24 +02:00
Skull Writter
06f670046b
Fix: #1731
Now checks if the domain is suspended (WEB or EMAIL or DNS) if so, continue to the next domain
2018-10-25 19:44:46 +00:00
Skull Writter
50205c99ec
supose fix to #1526
i cannot see any diference, but on debian it apears that there is an diference.
maybe because the system has tis var exported? (DISK)
2018-10-25 19:20:08 +00:00
Alexandr Loskutov
20735121f7
Merge pull request #1728 from moucho/spanish
spanish revision
2018-10-19 07:19:38 +03:00
Marcos
b9252066e1 spanish revision 2018-10-19 01:54:22 +02:00
Serghey Rodin
8e37c4fa0f switch from c.vestacp.com to local configs 2018-10-18 17:46:34 +03:00
Serghey Rodin
cbbf27fc46 Additional argument check for remote hosts 2018-10-18 14:36:17 +03:00
Serghey Rodin
9a0bbbfd45 Merge branch 'master' of github.com:serghey-rodin/vesta 2018-10-18 14:20:30 +03:00
Serghey Rodin
32fbc253a9 Additional argument check for remote hosts 2018-10-18 14:20:14 +03:00
Serghey Rodin
14c093a6a1
Merge pull request #1727 from serghey-rodin/madeITBelgium-patch-4
Fix bug in password reset
2018-10-18 12:21:00 +03:00
Made I.T
f6f6f9cfbb
Fix bug in password reset 2018-10-18 10:01:35 +02:00
Serghey Rodin
defba72215 added missing month in spec file 2018-10-18 00:27:22 +03:00
Serghey Rodin
83bd1f679f added missing month in spec file 2018-10-18 00:23:56 +03:00
Serghey Rodin
cde4269170 Release 0.9.8-23 2018-10-18 00:14:28 +03:00
Serghey Rodin
d880b5b425 limit sudo for admin to vesta scripts only 2018-10-17 23:58:27 +03:00
Serghey Rodin
5f68c1b634 Timing attack fix from security experts https://arcturussecurity.com 2018-10-17 23:28:37 +03:00
Serghey Rodin
67a0e8d108 limit config visibility to /etc and /var/lib 2018-10-17 22:27:06 +03:00
Serghey Rodin
a1b3aa3a84 No stats with distro name anymore 2018-10-17 22:06:17 +03:00
Serghey Rodin
1557f9bc8c Security: separate passwords for databases 2018-10-17 17:27:03 +03:00
Alexandr Loskutov
a7e115fbb3
Merge pull request #1722 from moucho/spanish
Spanish translation revision
2018-10-14 22:07:55 +03:00
marcos
a12466f5cc suspend_message 2018-10-14 15:31:38 +02:00
marcos
7b0597fc41 traducciones 2018-10-14 15:28:48 +02:00
Clark Chen
c7f6bf4e28
Traditional Chinese - TW, update to match en.php
This update the file to match 100% as en.php, also corrected some term in the file
2018-09-17 22:02:04 -05:00
Clark Chen
a54771261d
Traditional Chinese - TW, update to match en.php
This update the file to match 100% as en.php, also corrected some term in the file
2018-09-17 21:59:22 -05:00
Clark Chen
74334fae11
Traditional Chinese - TW, update to match en.php
This update the file to match 100% as en.php, also corrected some term in the file
2018-09-17 21:57:06 -05:00
dpeca
347e24fb7a
Merge pull request #1702 from skullwritter/patch-6
Enable utf8mb4 charset: #1698
2018-09-13 15:55:16 +02:00
Alexandr Loskutov
13e75fea29
Merge pull request #1705 from myrevery/patch-1
Update cn.php
2018-09-09 21:04:08 +03:00
myrevery
5420b2c95d
Update cn.php
Add new keyword and refine some details.
2018-09-10 01:59:17 +08:00
dpeca
cbaffbd561
Merge pull request #1704 from serghey-rodin/Skamasle-patch-2
Fix function check_result
2018-09-09 16:44:19 +02:00
Maksim Usmanov | Maks
5bd270591c
Fix function check_result
Check_error not defined
2018-09-09 13:51:00 +02:00
Alexandr Loskutov
1ea1bf6787
Merge pull request #1703 from Seia-Soto/master
Update translations
2018-09-09 14:03:17 +03:00
Skull Writter
7f20521c5b
Enable utf8mb4 charset
issue: #1698
2018-09-08 14:32:11 +00:00
Seia Soto
e7daba868b Update translations 2018-09-08 23:23:03 +09:00
Dmitry Bannik
d6c79c7d7e bugfix nginx templates 2018-09-03 21:57:45 +03:00
dpeca
d2c172641f
Merge pull request #1693 from skullwritter/patch-2
Correction on typos and to issue #1691
2018-08-31 18:22:09 +02:00
Skull Writter
1ba6d24189
Typo in function name 2018-08-31 15:49:32 +00:00
Skull Writter
d2764a6481
Missing function: is_format_valid_shell 2018-08-31 15:35:21 +00:00
Chernyavskiy Leonid
ebc67f6478 Fix invalid extension replace in add_web_config
Do not use globbing, because it kills too many characters.
Use conditionals and search at the end of the line instead.
2018-08-24 14:05:58 +07:00
dpeca
df7cccac4c
Little fix for previous commit
see 563a9d8b10
2018-08-12 04:25:18 +02:00
dpeca
563a9d8b10
Avoid blocking v-backup-user because of already dumped db
Well, in one db.conf I found duplicated entry for the same database.

root@btvc:~# cat /usr/local/vesta/data/users/btvc2011/db.conf
DB='btvc2011_cart' DBUSER='btvc2011_9091dn' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='1' SUSPENDED='no' TIME='' DATE=''
DB='btvc2011_cart' DBUSER='btvc2011_admin' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE=''
DB='btvc2011_cart' DBUSER='btvc2011_david' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE=''
DB='btvc2011_cart' DBUSER='btvc2011_djn' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE=''
DB='btvc2011_cart' DBUSER='btvc2011_jd' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE=''
DB='btvc2011_cart' DBUSER='btvc2011_oscar' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE=''

Obviously different users has access to the same database.
I know that this is impossible to create in Vesta.
But @Skamasle thirt-party script for importing cPanels backup obviously CAN do that... and many people use that cPanel importer.

This fix will avoid databases that are already dumped.
Without this fix backup script get stuck on stdin waiting for:
gzip: /backup/tmp.4YlV9Yr4m5/db/btvc2011_cart/btvc2011_cart.mysql.sql.gz already exists; do you wish to overwrite (y or n)?
2018-08-12 03:17:01 +02:00
Phinitnan Chanasabaeng
287da0f336 Reworked on Drupal's nginx template. 2018-08-11 16:01:41 +07:00
Serghey Rodin
0e484587a8 Added back policy.d block for daeomon autostart on install 2018-08-09 17:42:47 +03:00
Phinitnan Chanasabaeng
d2d6b85d43 Fixed missing NGINX rewrite rule for Drupal 7 & 8 2018-08-07 14:02:36 +07:00
Alexandr Loskutov
6825caa764
Merge pull request #1675 from crackerizer/thai-translation
Updated Thai translation
2018-08-06 06:50:21 +03:00
Phinitnan Chanasabaeng
8bb89d2eb6 Updated Thai translation 2018-08-06 10:35:41 +07:00
Serghey Rodin
6a34f064c4 Merge branch 'master' of github.com:serghey-rodin/vesta 2018-08-03 18:34:28 +03:00
Serghey Rodin
1c315de8d7 fix for ubuntu 14.04 2018-08-03 18:34:13 +03:00
Luiz Junior
47a22f4a25
Fix dovecot
namespace inbox {
2018-07-31 10:46:54 -03:00
Luiz Junior
4a27e61d60
Fix Dovecot Connection
Fix dovecot Connection
2018-07-31 10:32:47 -03:00
Anton Reutov
fbe93aa95b
Merge pull request #1653 from crackerizer/master
Fixed error on updating Letsencrypt cert with NGINX's Drupal template
2018-07-28 18:56:23 +02:00
Dmitry Bannik
98542d69bc Fix editing backup exclusions 2018-07-27 23:59:53 +03:00
dpeca
847e4f223b
Block .jar extension in email attachments in Exim
I saw .jar files that contains viruses that ClamAV not detected at all.
Not sure if @serghey-rodin think this is OK idea, so let he decide.
2018-07-27 17:39:38 +02:00
dpeca
33ba05c35b
Tell Exim to not to deny emails if ClamAV is unavailable or busy
Not sure if @serghey-rodin think this is OK idea, so let he decide.
I had a situation when company sent too much attachments, ClamAV didn't so fast to scan them all immediately, and therefore became unavailable, so Exim started to deny messages, which caused very bad situation in company.
With this "patch" Exim will not deny emails if ClamAV is unavailable or busy.
2018-07-27 17:27:56 +02:00
Phinitnan Chanasabaeng
7958b495c9 Updated and Fixed error on updating Letsencrypt cert with NGINX's drupal template. 2018-07-18 10:40:35 +07:00
Alexandr Loskutov
1096fcda9c
Merge pull request #1652 from myrevery/patch-2
Update cn.php
2018-07-15 13:45:21 +03:00
myrevery
79e34f240b
Update cn.php
Refine some details.
2018-07-15 16:33:32 +08:00
Serghey Rodin
07a7c90cf6 chkconfig firewalld off 2018-07-13 15:27:10 +03:00
dpeca
15f77bbf2b
Merge pull request #1649 from Hoto-Cocoa/patch-1
Improve korean i18n
2018-07-11 16:52:31 +02:00
Hoto Cocoa
fd88749791
Fix typo 2018-07-11 23:42:16 +09:00
Hoto Cocoa
f80e6c8df8
Improve korean i18n 2018-07-10 00:09:08 +09:00
dpeca
18cfd97338
Merge pull request #1644 from pan93412/trans
Update Chinese (Taiwan) Translation.
2018-07-05 12:35:15 +02:00
pan93412
289ff88e4d Update Chinese (Taiwan) Translation. 2018-07-05 18:28:23 +08:00
Alexandros Ioannides
979d6e7083
TLS 1.0 drop & TLS 1.3 addition 2018-07-03 23:57:11 +03:00
Serghey Rodin
41d698b2ce
Merge pull request #1634 from ioannidesalex/patch-56
Typo fix
2018-06-29 01:05:14 +03:00
Alexandros Ioannides
3933ca4cb4
Typo fix 2018-06-29 00:05:23 +03:00
Serghey Rodin
af04e1bdb9 clean php-fpm.conf 2018-06-28 00:55:13 +03:00
Serghey Rodin
5b4211b3da updated spec to 0.9.8-22 2018-06-27 12:00:44 +03:00
Anton Reutov
392caec58e
Merge pull request #1628 from clarkchentw/patch-2
Update tw.php
2018-06-25 09:59:51 +02:00
Clark Chen
dd19eef3aa
Update tw.php 2018-06-25 15:11:15 +08:00
Clark Chen
bffeed5739
Update tw.php 2018-06-25 15:10:04 +08:00
Clark Chen
397cf699bb
Update tw.php 2018-06-25 15:07:33 +08:00
Serghey Rodin
7f3e7d5b63 ip.sh include missing 2018-06-24 19:12:43 +03:00
Serghey Rodin
ece8efd505 0.9.8-22 2018-06-24 10:42:43 +03:00
Serghey Rodin
ca3a9e0895 Security fix for API hash check 2018-06-24 10:38:16 +03:00
Serghey Rodin
b6e26ac479 Fixed mysql-server package replacement 2018-06-22 16:55:52 +03:00
Serghey Rodin
f4751a4e97 Updated Amazon installer 2018-06-21 18:11:09 +03:00
Serghey Rodin
5fc8339a8d cosmetic fixes for CentOS and Amazon installers 2018-06-21 18:01:24 +03:00
Serghey Rodin
ca3956568b Updated CentOS installer 2018-06-21 15:40:22 +03:00
Serghey Rodin
17d0fb114e fix for debian and amazon installers 2018-06-21 11:40:07 +03:00
Serghey Rodin
955f3e7510 cosmetix fixes in ubuntu installer 2018-06-21 11:39:14 +03:00
Serghey Rodin
f59ebc4f65 Fix: nginx restart order 2018-06-14 18:00:44 +03:00
dpeca
4922062af6
Merge pull request #1617 from trajche/Roundcube-ubuntu-change-password
Fixing the change password for Roundcube to work with Ubuntu
2018-06-13 21:04:17 +02:00
TJ
6b2fafccb2 Fixing the change password for Roundcube to work with Ubuntu 2018-06-13 19:58:26 +03:00
Serghey Rodin
ee03eff016 udapted package defenition 2018-06-13 17:08:36 +03:00
dpeca
e08a123642
Merge pull request #1616 from ioannidesalex/patch-51
Minor fix
2018-06-11 21:21:53 +02:00
Alexandros Ioannides
4880746f8f
Minor fix 2018-06-11 20:21:13 +03:00
Serghey Rodin
f68bb795de Fixes for proper EIP handling 2018-06-08 11:40:42 +03:00
dpeca
4363244c1a
Changing /var/log/httpd/ to /var/log/%web_system%/ (debian9 http2.stpl) 2018-06-02 01:50:43 +02:00
dpeca
f759088dde
Changing /var/log/httpd/ to /var/log/%web_system%/ (debian9 http2.tpl) 2018-06-02 01:48:41 +02:00
dpeca
73a0b3fd95
Configurable $BACKUP_TEMP in v-restore-user 2018-06-02 00:55:52 +02:00
dpeca
11eca5dfda
Configurable $BACKUP_TEMP in v-backup-user 2018-06-02 00:52:31 +02:00
Anton Reutov
55f7598d69
Merge pull request #1598 from ioannidesalex/patch-42
NTP server modification
2018-06-01 14:53:19 +02:00
Serghey Rodin
21278272ad
Merge pull request #1586 from moucho/suspend_dns
Adding and removing includes when suspending/unsuspending DNS zones
2018-06-01 15:49:06 +03:00
Serghey Rodin
90a60579f3
Merge pull request #1589 from ioannidesalex/patch-33
vsftpd / fail2ban Fix
2018-06-01 15:48:12 +03:00
Serghey Rodin
497b7c5a33
Merge pull request #1594 from ioannidesalex/patch-38
nginx Configuration Optimizations
2018-06-01 15:46:59 +03:00
Serghey Rodin
c7d84e7b2c
Merge pull request #1597 from ioannidesalex/patch-41
Vesta PHP-FPM Optimization
2018-06-01 15:44:32 +03:00
Anton Reutov
84202ca51b
Merge pull request #1591 from ioannidesalex/patch-35
Minor cosmetic change
2018-06-01 14:43:46 +02:00
Serghey Rodin
71ca858ed2
Merge pull request #1606 from ioannidesalex/patch-49
Switch from /tmp to /backup
2018-06-01 15:42:07 +03:00
Alexandros Ioannides
cd61896176
Switch from /tmp to /backup 2018-06-01 13:57:37 +03:00
dpeca
308da454eb
Merge pull request #1593 from ioannidesalex/patch-37
vsftpd SSL Support & hardening
2018-06-01 12:40:30 +02:00
Anton Reutov
a5d0011ef7
Merge pull request #1590 from ioannidesalex/patch-34
Replace /tmp with $BACKUP
2018-06-01 09:52:54 +02:00
Serghey Rodin
70d5e2537f
Merge pull request #1533 from didyouexpectthat/patch-1
Change william.cage to example in mail_acc files
2018-06-01 00:56:23 +03:00
Serghey Rodin
828c8450e4
Merge pull request #1554 from vsitnic/master
set softquota=hardquota
2018-06-01 00:48:25 +03:00
Serghey Rodin
d0b1fa6e57
Merge pull request #1595 from ioannidesalex/patch-39
Typo in ip.sh comment
2018-06-01 00:47:39 +03:00
Serghey Rodin
2ddcff2915
Merge pull request #1596 from ioannidesalex/patch-40
Do not expose PHP Version
2018-06-01 00:46:36 +03:00
Serghey Rodin
eed9f3bf4b
Merge pull request #1602 from ioannidesalex/patch-46
Roundcube fail2ban fix
2018-06-01 00:44:30 +03:00
Serghey Rodin
5c7fd09642
Merge pull request #1599 from ioannidesalex/patch-43
Cosmetic changes
2018-06-01 00:42:15 +03:00
Serghey Rodin
c1c0443e20
Merge pull request #1600 from ioannidesalex/patch-44
Not always apache is used
2018-06-01 00:41:41 +03:00
Serghey Rodin
e44a7ca5a2
Merge pull request #1601 from ioannidesalex/patch-45
Small fix PHP-FPM
2018-06-01 00:41:06 +03:00
Alexandros Ioannides
eca2fdc073
Roundcube fail2ban fix 2018-05-31 23:51:09 +03:00
Alexandros Ioannides
52e9b19df6
Small fix PHP-FPM 2018-05-31 23:20:30 +03:00
Alexandros Ioannides
cb20b0bfd1
Not always apache is used 2018-05-31 23:08:39 +03:00
Alexandros Ioannides
3ecce92e16
Cosmetic changes 2018-05-31 22:44:10 +03:00
Alexandros Ioannides
ce96bc9388
NTP fix 2018-05-31 22:32:26 +03:00
Alexandros Ioannides
334436e503
Vesta PHP-FPM Optimization 2018-05-31 22:12:31 +03:00
Alexandros Ioannides
51f3dea7da
Do not expose PHP Version 2018-05-31 22:05:38 +03:00
dpeca
54cae504f0
Merge pull request #1592 from ioannidesalex/patch-36, Minor roundcube fixes
Minor roundcube fixes
2018-05-31 21:05:00 +02:00
Alexandros Ioannides
5e536570de
Typo 2018-05-31 21:58:46 +03:00
Alexandros Ioannides
cdbd689065
Optimizations 2018-05-31 21:52:09 +03:00
Alexandros Ioannides
e1024e0483
vsftpd SSL Support & hardening 2018-05-31 21:42:03 +03:00
Alexandros Ioannides
53c58d2bb3
Minor fixes 2018-05-31 21:36:49 +03:00
Alexandros Ioannides
3e0a67113e
Update exim4.conf.template 2018-05-31 21:27:41 +03:00
Alexandros Ioannides
b06ddecbc1
Replace /tmp with $BACKUP
/tmp size is not enough for larger websites.
2018-05-31 21:21:16 +03:00
Serghey Rodin
e9589f586d
Merge pull request #1588 from ioannidesalex/patch-32
Fix nologin
2018-05-31 21:09:26 +03:00
Alexandros Ioannides
7a28629ffc
vsftpd Fix 2018-05-31 21:08:24 +03:00
Alexandros Ioannides
73e72183b2
Fix nologin 2018-05-31 21:01:49 +03:00
Serghey Rodin
a3f0fa1501 New ubuntu installer 2018-05-31 18:15:53 +03:00
Serghey Rodin
208db116d1 fixed my.cnf config location 2018-05-31 18:14:14 +03:00
Serghey Rodin
4a3cec1290 default configs for ubuntu releases 2018-05-31 16:01:46 +03:00
Serghey Rodin
4401d706a4 Amazon Linux Support 2018-05-31 15:56:34 +03:00
dpeca
1304a7312d
Merge pull request #1587 from moucho/web_alias
Fix Adding alias DNS from web panel
2018-05-30 01:20:54 +02:00
Marcos
b2649fd3cc Fix Adding alias DNS from web panel 2018-05-29 23:42:58 +02:00
Marcos
b143792750 Adding and removing includes when suspending/unsuspending DNS zones 2018-05-29 20:01:29 +02:00
dpeca
78bccef43c
Merge pull request #1582 from moucho/deletedomain_error
Fix on deleting last web domain was deleting all includes in /etc/*/conf.d/vesta.conf for some usernames
2018-05-26 21:26:03 +02:00
Marcos
04a55260ca Fix delete domain 2018-05-26 20:14:47 +02:00
dpeca
ed1ad943cf
Centos6 roundcube password driver typo fix 2018-05-25 17:21:03 +02:00
dpeca
b8375c5833
Merge pull request #1577 from moucho/error_tab
Do not allow {tab} as a valid character for a domain
2018-05-21 11:50:11 +02:00
dpeca
f1a6b3783c
Merge pull request #1576 from moucho/rebuild_problem
Fix rebuild-web-domain deleting all includes in /etc/*/conf.d/vesta.conf for some usernames
2018-05-21 11:48:19 +02:00
Alexandr Loskutov
92f70d7178
Merge pull request #1578 from moucho/translation_apps
Updated Spanish translation
2018-05-21 07:16:03 +03:00
Marcos
a5e093da16 Apps translation 2018-05-21 04:03:26 +02:00
Marcos
0f48ec04f0 Do not allow {tab} on a domain name 2018-05-21 03:59:55 +02:00
Marcos
85b3578f9c Fix rebuild for some user names 2018-05-21 03:55:05 +02:00
Marcos
37c69b8f4c Don't exclude "logs" folder recursively 2018-05-21 03:41:46 +02:00
Serghey Rodin
3aadf37a82 Temporary fix for CentOS Vault issue 2018-05-17 18:27:28 +03:00
Serghey Rodin
c80c4c472e Additional rXSS fix / closes #1558 2018-05-16 17:23:04 +03:00
Anton Reutov
e62432e672
Merge pull request #1570 from robindirksen1/patch-6
Update nl.php
2018-05-14 19:40:55 +02:00
Robin Dirksen
97e0e0644d
Update nl.php
Added apps translation
2018-05-14 17:06:35 +02:00
dpeca
599a07fa60
Small fixes in serbian translation 2018-05-14 16:04:30 +02:00
Serghey Rodin
2ebc6a7ec8 Merge branch 'master' of github.com:serghey-rodin/vesta 2018-05-14 16:23:08 +03:00
dpeca
e79de3c834
Merge pull request #1566 from wojsmol/patch-1
Fix typo in add_sudo.sh
2018-05-13 14:14:34 +02:00
Wojciech Smoliński
ad96554e77
Fix typo in add_sudo.sh 2018-05-12 16:57:11 +02:00
Serghey Rodin
314f08b484 Release 0.9.8-21 2018-05-11 17:09:18 +03:00
Serghey Rodin
19400663ec delete eval from roundcube configs 2018-05-11 16:44:45 +03:00
Serghey Rodin
4e81382cd8 fixed typo / closes #1561 2018-05-11 16:43:53 +03:00
Serghey Rodin
dd2a57e408 Vesta CP 0.9.8–20 rXSS to RCE / solves #1558 2018-05-11 16:17:23 +03:00
Serghey Rodin
2cb01e0c73 Merge branch 'master' of github.com:serghey-rodin/vesta 2018-05-08 15:45:47 +03:00
dpeca
4baf5ebc2c
Get vesta port by reading nginx.conf 2018-05-04 12:35:28 +02:00
Serghey Rodin
91db05f1f8 Merge branch 'master' of github.com:serghey-rodin/vesta 2018-04-30 15:29:31 +03:00
Serghey Rodin
4f4cc763a7 RACK911LABS.COM: symlink check 2018-04-27 15:36:41 +03:00
Vadim Sitnic
9148f7c9c2 set softquota=hardquota 2018-04-27 11:33:13 +03:00
dpeca
8d85cdcb2c
Wait 10 sec only while renewing LE for more than 1 domain 2018-04-26 19:11:51 +02:00
Serghey Rodin
a21ecd0ad0 RACK911LABS.COM: safer log parser 2018-04-26 18:17:09 +03:00
Serghey Rodin
b5874764a7 RACK911LABS.COM: safer mysql/pgsql query 2018-04-26 17:29:13 +03:00
Serghey Rodin
4c751ab693 RACK911LABS.COM: safer mysql status check 2018-04-26 17:14:19 +03:00
Serghey Rodin
73e6656986 RACK911LABS.COM: simpler and safer hash check 2018-04-26 16:42:00 +03:00
Anton Reutov
d14b7d969c
Merge pull request #1548 from Secretjail/patch-8
Update fa.php
2018-04-17 12:57:55 +03:00
Asfihani
17f198cc36 Add Wordpress WP Super Cache plugin template support 2018-04-17 16:44:12 +07:00
asfihani
3f9f8d9467
Add wp super cache support 2018-04-17 16:27:38 +07:00
asfihani
3742d5f13d
Add wp super cache support 2018-04-17 16:23:36 +07:00
Secretjail
5fed5bb889
Update fa.php
add Apps (softaculous).
2018-04-17 13:32:32 +04:30
dpeca
c3cfd66228
Merge pull request #1543 from robindirksen1/patch-5
Update v-update-host-certificate for restart vsftpd
2018-04-12 16:44:06 +02:00
Robin Dirksen
d14d4cddfb
Update v-update-host-certificate
https://github.com/serghey-rodin/vesta/pull/1543#issuecomment-380798986
2018-04-12 16:27:47 +02:00
Robin Dirksen
12306ce834
Update v-update-host-certificate
Restart mailserver & ftpserver based on `conf/vesta.conf` settings, so the new certificate will be applied.
2018-04-12 14:28:23 +02:00
dpeca
b7c19a8e63
Allow /reset/mail/ only from localhost
Block connection from outside, that could brute force password guessing
2018-04-12 01:08:35 +02:00
darkworks
acf3e0be13
check for yum properly.
check for yum properly.
2018-04-10 19:53:27 +05:00
Serghey Rodin
06f6fff118 one ver up 2018-04-09 19:23:22 +03:00
Serghey Rodin
eaf9d89096 Auth fix 0.9.8-20 2018-04-09 00:44:32 +03:00
didyouexpectthat
07ec81b6ae
Change william.cage to example
Feedback in #1530
2018-04-08 14:11:41 -07:00
didyouexpectthat
c1d87b2823
Change william.cage to example
Feedback in https://github.com/serghey-rodin/vesta/issues/1530
2018-04-08 14:09:07 -07:00
Serghey Rodin
1034d1bbc2 New release with improved password checks 2018-04-08 22:09:56 +03:00
Serghey Rodin
0d5c3c42a1 set -o noglob just in case 2018-04-08 22:06:20 +03:00
Serghey Rodin
efa2b50b4c Enabled access log 2018-04-08 22:01:43 +03:00
Serghey Rodin
3fdee2975d Hardening password checks 2018-04-08 21:50:32 +03:00
Alexandr Loskutov
ffdae1dca1
Merge pull request #1529 from AiratHalitov/patch-1
Update ru.php
2018-04-08 07:36:55 +03:00
Airat Halitov
6d0e4efe2e
Update ru.php
Обновил переводы графиков
2018-04-08 02:34:48 +05:00
dpeca
b2e75d89b7
Making Vesta able to update hostname SSL automatically
This feature will allow VestaCP to automatically update system SSL when you add SSL to your domain (that is also hostname) through VestaCP panel.
For example, if your server hostname is my.server.net and you add SSL to that domain (as you usually do via VestaCP panel), that SSL will be also installed to Vesta nginx (on 8083 port), to Exim and to devocot.
This will work if you use LetsEncrypt, and it will also automatically apply renewed certificate when Vesta renew letsencrypt certificate.

--- IMPORTANT ---
This feature will work only if you have
UPDATE_HOSTNAME_SSL='yes'
in /usr/local/vesta/conf/vesta.conf

Why?
Because I'm not sure that Serghey want to use this mechanism for installing system SSL.
So, this way it's only OPTIONAL feature, not enabled by default.
On all servers nothing will happen.

If Sergey likes this idea, he will easily make it enabled by default.

Cheers.
2018-04-07 00:38:55 +02:00
dpeca
082095b164
Better way to restart services in v-update-host-certificate 2018-04-07 00:20:35 +02:00
dpeca
d942f85d31
Clean-up for both config styles if there is no more domains
Fix #1458
2018-04-06 18:20:35 +02:00
dpeca
7ec123a861
Refactoring rebuild_mysql_database() func
Fix #1523
2018-04-06 14:50:42 +02:00
dpeca
b3d78bbfdb
Avoiding IF NOT EXISTS for MariaDB 5.x in rebuild_mysql_database() 2018-04-05 23:58:47 +02:00
dpeca
69f01fb227
Adding missing >/dev/null in rebuild_mysql_database() func 2018-04-05 23:12:42 +02:00
dpeca
eb7e6d2fba
Fixing MySQL restore user privileges (MariaDB)
Fix #1523
2018-04-05 22:07:36 +02:00
dpeca
6b97f7394c
Determining is it MySQL or MariaDB in mysql_connect() func 2018-04-05 21:55:39 +02:00
Serghey Rodin
58c9656779 Merge branch 'master' of github.com:serghey-rodin/vesta 2018-03-29 16:35:40 +03:00
Serghey Rodin
4ef7131065 few fixes for aws linux support 2018-03-29 16:35:31 +03:00
dpeca
7f734c4fe9
Merge pull request #1506 from nothinux/i18n-id
fix indonesian translation
2018-03-06 07:55:15 +01:00
nothinux
4c1a67a9b1 fix indonesian translation 2018-03-06 12:36:32 +07:00
Serghey Rodin
4cc3c1d287 Amazon linux support 2018-02-14 17:10:14 +02:00
info@madeit.be
26c311b773 Revert "Fix default alias"
This reverts commit 74fa6d5b0c.
2018-02-13 22:17:33 +00:00
Maksim Usmanov | Maks
74fa6d5b0c
Fix default alias
This

grep -v www.$domain make imposible to add default alias or some order alias if contain www. wwww. hiwww. so if you delete your default alias you cant add it any more.

I check this and not know why is excluded, for me there is no reason for that grep
2018-02-13 22:54:34 +01:00
Anton Reutov
da5bcbe624
Fix backup rotate for ftp/sftp mode 2018-02-08 12:10:23 +03:00
dpeca
a217391565
Debian: Tolerate error in systemd/clamav-daemon.service if dir already exists 2018-02-07 21:02:53 +01:00
info@madeit.be
40011f8f75 #1462 2018-01-31 10:46:18 +00:00
Serghey Rodin
421ecfa62c install apparmor-utils 2018-01-26 16:08:55 +02:00
Anton Reutov
bc82fcaf71
Merge pull request #1453 from Skamasle/patch-19
Fix Min and hour limit in cron validation
2018-01-25 18:48:43 +03:00
Anton Reutov
add956bb62
Merge pull request #1452 from Skamasle/patch-18
Fix cron validation
2018-01-25 18:48:19 +03:00
Emmanuel Higgins
4b1b1e3299
644 chmod should only apply to files 2018-01-25 19:30:38 +11:00
Maksim Usmanov | Maks
2e03b516f8
Fix Min and hour limit in cron validation 2018-01-24 00:29:03 +01:00
Maksim Usmanov | Maks
5a108be182
Fix cron validation
New vesta cron generator not works if you have some format ranges like:

1,2 2 * 5,2,4,1
or
1-10 * * * *
2018-01-23 23:53:27 +01:00
Serghey Rodin
8a217352fe fix ssl backup restore 2018-01-19 18:10:54 +02:00
Serghey Rodin
9a9dabb0c9 reverting back chunked upload feature 2018-01-18 18:20:22 +02:00
Alexandr Loskutov
c042fa2689 Fix backup restore 2018-01-18 15:40:50 +02:00
Alexandr Loskutov
bea7ccd25e Fix backup restore 2018-01-18 14:32:25 +02:00
Anton Reutov
12409ddeaf
Merge pull request #1423 from serghey-rodin/madeITBelgium-patch-4
#1421 - Fix Backup retention
2018-01-12 00:13:15 +03:00
Serghey Rodin
a65fb3c2ee release 0.9.8-19 hotfix for backup restore 2018-01-10 14:10:01 +02:00
Serghey Rodin
8773ac2071 Updated notification release number 2018-01-10 14:07:03 +02:00
Serghey Rodin
3021abecb6 Fixed backup restore function 2018-01-10 14:06:11 +02:00
dpeca
9585a2a369
Debian9 Roundcube mysql password fix 2018-01-07 19:08:51 +01:00
Somthanat Wongsa
c28dcc1037 fix php open_basedir error when using public_shtml as a document root 2018-01-06 13:20:16 +07:00
Serghey Rodin
8c9c4116b0 added net-tools 2018-01-05 18:32:22 +02:00
Serghey Rodin
a7333684a2 proper template location for debian 9 2018-01-04 22:16:49 +02:00
Made I.T
9059167db7
#1421 - Fix Backup retention
Fix #1421
2018-01-02 21:05:31 +01:00
Serghey Rodin
351d2a78cf small fixes for softaculous plugin enable/disable 2018-01-02 16:39:05 +02:00
Serghey Rodin
e986e48baf added missing ; 2018-01-02 11:52:57 +02:00
Serghey Rodin
5b834dc8c1 fixes for php-fpm on debian 9 2017-12-31 11:45:21 +02:00
Serghey Rodin
9d7d9f34f7 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-30 12:52:19 +02:00
Serghey Rodin
d7eb12defa fix for multiple php-fpm init scripts 2017-12-30 12:51:37 +02:00
Serghey Rodin
6da6d38cfd install configs for debian 9 2017-12-30 12:01:58 +02:00
Serghey Rodin
80f65d54de oldstyle config for dovecot 2017-12-30 11:19:25 +02:00
Serghey Rodin
02afaffa73 Debian 9 Support 2017-12-29 22:02:01 +02:00
Serghey Rodin
d8e200f759 new line after text 2017-12-29 17:54:27 +02:00
Serghey Rodin
e20a340a70 release notifications 2017-12-29 16:32:12 +02:00
Serghey Rodin
5a1fb95d5d add/delete symlink for softaculous 2017-12-29 14:20:48 +02:00
Serghey Rodin
2b5d7d3c98 increased timeout for backend 2017-12-29 13:55:38 +02:00
Serghey Rodin
ca786aae4d vesta-softaculous for ubuntu installer 2017-12-29 13:45:46 +02:00
Serghey Rodin
62a8c4ec92 vesta-softaculous for debian installer 2017-12-29 13:37:43 +02:00
Serghey Rodin
08fafbcd85 vesta-softaculous for rhel installer 2017-12-29 13:32:35 +02:00
Serghey Rodin
fe93b08c6e adedd vim-common + improved formatting: 79 characters per line 2017-12-29 13:27:09 +02:00
Serghey Rodin
651ba4c1aa adedd vim-common + improved formatting: 79 characters per line 2017-12-29 13:15:25 +02:00
Serghey Rodin
273f4dec96 formatting: 79 characters per line 2017-12-29 12:16:41 +02:00
Serghey Rodin
477df2eefc updated language list 2017-12-29 12:01:16 +02:00
Alexandr Loskutov
5e213a2cf8 Update packages
Update packages for all supported OS
2017-12-29 10:21:50 +02:00
Alexandr Loskutov
f5b0afc9fd
Merge pull request #1404 from ioannidesalex/patch-22
Update default.pkg
2017-12-29 09:57:36 +02:00
Serghey Rodin
b1449299bc improved domain validation 2017-12-29 02:53:38 +02:00
Serghey Rodin
6bcebeaba5 ondemand instead of dynamic php-fpm 2017-12-29 01:41:43 +02:00
Alexandros Ioannides
258848119e
Update default.pkg 2017-12-29 01:18:59 +02:00
Serghey Rodin
48c7b7f797 fail2ban improvements from ioannidesalex 2017-12-29 01:16:45 +02:00
Serghey Rodin
04d4b4cb59 fixes from ioannidesalex 2017-12-29 01:14:21 +02:00
Serghey Rodin
5c4c53bd36 propagated php-fpm templates across all distros 2017-12-29 01:12:42 +02:00
Serghey Rodin
6b434d90d5
Merge pull request #1389 from ioannidesalex/patch-7
Add support for Roundcube & small changes
2017-12-29 01:06:25 +02:00
Serghey Rodin
d9ead934ac
Merge pull request #1388 from ioannidesalex/patch-6
Small fixes for exim
2017-12-29 01:04:15 +02:00
Serghey Rodin
bc27c0fa4e
Merge pull request #1397 from ioannidesalex/patch-15
Update no-php.tpl
2017-12-29 00:55:55 +02:00
Serghey Rodin
d6b1ca66a4
Merge pull request #1399 from ioannidesalex/patch-17
Update socket.tpl
2017-12-29 00:55:28 +02:00
Serghey Rodin
941085608e
Merge pull request #1398 from ioannidesalex/patch-16
Ondemand instead of Dynamic & Add Status Page
2017-12-29 00:55:00 +02:00
Serghey Rodin
07dc2d2827
Merge pull request #1396 from ioannidesalex/patch-14
Use ondemand instead of dynamic
2017-12-29 00:53:57 +02:00
Serghey Rodin
ca76ac2ba5
Merge pull request #1369 from cdnmall/patch-2
improved fail2ban support for vsftpd
2017-12-29 00:48:58 +02:00
Serghey Rodin
a2c7eed679
Merge pull request #1400 from ioannidesalex/patch-18
Update sendy.tpl
2017-12-29 00:47:51 +02:00
Serghey Rodin
d6f9ab6772
Merge pull request #1401 from ioannidesalex/patch-19
Tweaks & HTTP/2 support
2017-12-29 00:47:29 +02:00
Serghey Rodin
93457fe62d proper name for top level domain 2017-12-29 00:29:24 +02:00
Serghey Rodin
bf32125156
Merge pull request #1392 from ioannidesalex/patch-10
Update gainsboro.pkg
2017-12-29 00:27:31 +02:00
Serghey Rodin
80ac963efe
Merge pull request #1393 from ioannidesalex/patch-11
Update palegreen.pkg
2017-12-29 00:27:15 +02:00
Serghey Rodin
5f21e26deb
Merge pull request #1394 from ioannidesalex/patch-12
Update slategrey.pkg
2017-12-29 00:27:01 +02:00
Serghey Rodin
c3872c26ee
Merge pull request #1395 from ioannidesalex/patch-13
Fix
2017-12-29 00:26:49 +02:00
Serghey Rodin
dcf0ae96a8
Merge pull request #1384 from ioannidesalex/patch-1
Update v-backup-user
2017-12-29 00:00:01 +02:00
Serghey Rodin
c647fe1ecd
Merge pull request #1385 from ioannidesalex/patch-2
Update vst-install.sh
2017-12-28 23:59:42 +02:00
Alexandros Ioannides
d2bf098d52
Tweaks & HTTP/2 support 2017-12-28 19:03:07 +02:00
Alexandros Ioannides
8655249464
Update sendy.tpl 2017-12-28 18:55:39 +02:00
Alexandros Ioannides
28e31835c8
Update no-php.tpl 2017-12-28 18:42:17 +02:00
Alexandros Ioannides
9aa07a8ed6
Update default.tpl 2017-12-28 18:41:24 +02:00
Alexandros Ioannides
34c45bcbb5
Update socket.tpl 2017-12-28 18:40:50 +02:00
Alexandros Ioannides
7abdb894c8
Ondemand instead of Dynamic & Add Status Page
Much more efficient. Also added PHP-FPM Status Page
2017-12-28 18:38:00 +02:00
Alexandros Ioannides
0d83da9638
Update no-php.tpl 2017-12-28 18:30:00 +02:00
Alexandros Ioannides
f75c413179
Use ondemand instead of dynamic
I believe ondemand is much more efficient on resource usage.
2017-12-28 18:24:03 +02:00
Alexandros Ioannides
27d01ba171
Fix 2017-12-28 18:08:55 +02:00
Alexandros Ioannides
63f430b649
Update slategrey.pkg 2017-12-28 18:04:20 +02:00
Alexandros Ioannides
703503e1b5
Update palegreen.pkg 2017-12-28 18:03:19 +02:00
Alexandros Ioannides
fef55f9044
Update gainsboro.pkg 2017-12-28 18:02:17 +02:00
Alexandros Ioannides
7dbfc18398
Add support for Roundcube & small changes 2017-12-28 17:23:09 +02:00
Alexandros Ioannides
b15c696294
Small fixes 2017-12-28 17:13:39 +02:00
Alexandros Ioannides
7ad37eb7e2
Update vst-install.sh 2017-12-28 16:26:01 +02:00
Serghey Rodin
5556e03090
Merge pull request #989 from Skamasle/patch-10
Fix for mysql 5.7 when reset password
2017-12-28 16:06:35 +02:00
Serghey Rodin
aa08f6c421
Merge pull request #1305 from hidonet/patch-1
Duplicate interface name detection fix
2017-12-28 16:05:42 +02:00
Serghey Rodin
128906e624
Merge pull request #1310 from bergentroll/bergentroll_install_lang_patch
Install scripts lang patch
2017-12-28 16:04:19 +02:00
Serghey Rodin
33f09782de
Merge pull request #1227 from szbnwer/master
Fixed the name in logging
2017-12-28 15:59:27 +02:00
Serghey Rodin
78c730b36c
Merge pull request #1244 from cmstew/v-sync-dns-cluster-history-log-bug-fix
Minor bug fix of v-sync-dns-cluster
2017-12-28 15:58:01 +02:00
Serghey Rodin
6fc3a45932
Merge pull request #1249 from chipitsine/centos7_nolimit
CentOS 7: increase number of open files
2017-12-28 15:56:45 +02:00
Serghey Rodin
09c884f556
Merge pull request #1254 from ClayRabbit/patch-1
v-backup-user: On-the-fly gzip compression
2017-12-28 15:55:06 +02:00
Serghey Rodin
0c05448e08
Merge pull request #1260 from gohdan/find_symlinks
Add symlink support to find
2017-12-28 15:53:24 +02:00
Serghey Rodin
aefc654922
Merge pull request #1267 from IStranger/master
fix db.sh for postgres 9.5+
2017-12-28 15:52:16 +02:00
Serghey Rodin
dcd52e3caa
Merge pull request #1278 from moucho/master
Improved DNS zone & Fix for v-suspend-mail-account
2017-12-28 15:51:56 +02:00
Serghey Rodin
f2371b8d4c
Merge pull request #1281 from eka7a/master
Warning: autocreate plugin is deprecated, use mailbox { auto } setting instead
2017-12-28 15:48:47 +02:00
Serghey Rodin
8fdf7105a9
Merge pull request #1110 from rfzh1996/rfzh1996-patch-1
Using Yum to install epel-release package
2017-12-28 15:44:11 +02:00
Serghey Rodin
0645dc85ad
Merge pull request #1114 from robindirksen1/http2-support
HTTP2 support
2017-12-28 15:43:36 +02:00
Serghey Rodin
409bef78e0
Merge pull request #1118 from ianklemm/patch-2
Add Apache error documents
2017-12-28 15:32:28 +02:00
Serghey Rodin
5789d94a96 improved default php-fpm template 2017-12-28 15:29:35 +02:00
Serghey Rodin
18f485fa42
Merge pull request #1124 from cybernet/patch-1
default tmp dir
2017-12-28 15:26:46 +02:00
Serghey Rodin
1b2efcecaa added sendy template 2017-12-28 15:23:00 +02:00
Serghey Rodin
8aff5db015 delted unnecessary backslashes 2017-12-28 15:22:42 +02:00
Serghey Rodin
f65edd6056
Merge pull request #1138 from serghey-rodin/madeITBelgium-patch-2
Fix for Databases size not updated.
2017-12-28 15:21:33 +02:00
Serghey Rodin
4a2f0424e8
Merge pull request #1142 from Srgk/master
fix tmp dir for restore backup user
2017-12-28 15:19:53 +02:00
Serghey Rodin
2d19400eac
Merge pull request #1144 from icez/master
[*]: fix open_basedir document root value for SSL-enabled site
2017-12-28 15:18:10 +02:00
Serghey Rodin
0e2ba8a269
Merge pull request #1152 from lapuh/patch-1
Update v-rebuild-web-domains
2017-12-28 15:15:19 +02:00
Serghey Rodin
c9b2245eb0
Merge pull request #1185 from myrevery/master
Update templates static file.
2017-12-28 15:12:49 +02:00
Serghey Rodin
0f457b3c51
Merge pull request #1192 from spfuture/patch-1
Update v-list-sys-services  This fix detect another path for php-fpm, correctly detect service name
2017-12-28 15:11:53 +02:00
Serghey Rodin
d2bab6817f
Merge pull request #1201 from Piotr-Pht-Jasiek/patch-4
Add to template wordpress2 rewrite for worpress
2017-12-28 15:11:02 +02:00
Serghey Rodin
a3555552bc
Merge pull request #1200 from Piotr-Pht-Jasiek/patch-5
Add to template wordpress2(s) rewrite for worpress
2017-12-28 15:10:37 +02:00
Serghey Rodin
e4ed3ba3c5 added chown back for $VESTA/data/sessions 2017-12-28 15:09:43 +02:00
Serghey Rodin
4b226fa49b
Merge pull request #1207 from fliker09/master
Small code and spell check fixes for rhel installer
2017-12-28 15:08:20 +02:00
Serghey Rodin
c076d661a3
Merge pull request #1098 from ianklemm/patch-1
Fix quota
2017-12-28 15:00:43 +02:00
Serghey Rodin
de6eb649ea
Merge pull request #1091 from Skamasle/patch-16
Fix DNS issue whit some characters
2017-12-28 14:58:05 +02:00
Serghey Rodin
1657ebd44e
Merge pull request #1061 from Tulga/patch-2
Improvement: jquery file upload, chunked file upload options enabled
2017-12-28 14:54:51 +02:00
Serghey Rodin
22a8d3064d
Merge pull request #1059 from Tulga/patch-3
Improvement on download file script
2017-12-28 14:52:27 +02:00
Serghey Rodin
4918fda6d1
Merge pull request #1045 from Matige/master
Add global flag for variables when backend config is generated
2017-12-28 14:50:22 +02:00
Serghey Rodin
54f55d2ce8
Merge pull request #1015 from Piterden/patch-3
Fixed restarting php daemon error. Ubuntu 16.04
2017-12-28 14:39:05 +02:00
Serghey Rodin
09cf06d486
Merge pull request #944 from ioannidesalex/patch-22
Support for Sendy with nginx (SSL)
2017-12-28 14:29:25 +02:00
Alexandros Ioannides
b48ed75871
Update v-backup-user 2017-12-28 14:25:34 +02:00
Serghey Rodin
b5c0a83250 changed localhost.ltd to domain.ltd 2017-12-28 14:17:53 +02:00
Serghey Rodin
c940632378 fix for multiple init scripts 2017-12-28 14:16:14 +02:00
Serghey Rodin
d4ddd2cbd4
Merge pull request #1361 from edgarasg/patch-1
Add public IP in ftp config
2017-12-28 13:57:08 +02:00
Serghey Rodin
936ee3b63e
Merge pull request #1363 from dekyfin/master
Fixed Empty ftp backup files #515
2017-12-28 13:56:06 +02:00
Serghey Rodin
56c370e3a9
Merge pull request #1370 from cdnmall/patch-3
fix annoying rebuild error
2017-12-28 13:54:25 +02:00
Serghey Rodin
a7834c42f3
Merge pull request #1376 from mghadam/fix_mysqlrootpwdchange
Added updating .my.cnf file when changing root password
2017-12-28 13:47:51 +02:00
Serghey Rodin
4e102d4ecf Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-27 19:08:41 +02:00
Serghey Rodin
5a42216130 Fix domain rebuild for new conf style 2017-12-27 19:08:28 +02:00
Serghey Rodin
85f6d3a08f Imrovements for Softaculous App Installer 2017-12-27 19:07:30 +02:00
Serghey Rodin
f397d6d417 removed double ; 2017-12-24 22:06:38 +02:00
Serghey Rodin
acdcfd3aac added trailing ; 2017-12-24 21:45:24 +02:00
Anton Reutov
9de4900f43
Minor fix for location vstats 2017-12-24 21:41:16 +03:00
Anton Reutov
b4be39bfd0
Minor fix for location vstats 2017-12-24 21:41:10 +03:00
Anton Reutov
887fabd7b1
Minor fix for location vstats 2017-12-24 21:41:07 +03:00
Anton Reutov
a98c825bfe
Minor fix for location vstats 2017-12-24 21:40:53 +03:00
Anton Reutov
6321daca29
Minor fix for location vstats 2017-12-24 21:40:50 +03:00
Anton Reutov
974ab1bbdb
Minor fix for location vstats 2017-12-24 21:40:35 +03:00
Anton Reutov
7055e98536
Minor fix for location vstats 2017-12-24 21:40:32 +03:00
Anton Reutov
27ca0252f7
Minor fix for location vstats 2017-12-24 21:40:28 +03:00
Anton Reutov
aaac5aeb2b
Minor fix for location vstats 2017-12-24 21:38:42 +03:00
Anton Reutov
86c3a44d67
Minor fix for location vstats 2017-12-24 21:38:36 +03:00
Anton Reutov
bf7bd2d798
Minor fix for location vstats 2017-12-24 21:38:29 +03:00
Anton Reutov
67c63a27f6
Minor fix for location vstats 2017-12-24 21:38:23 +03:00
Anton Reutov
cabac735fe
Minor fix for location vstats 2017-12-24 21:38:18 +03:00
Anton Reutov
960c030fe1
Minor fix for location vstats 2017-12-24 21:36:34 +03:00
Anton Reutov
21831498f4
Minor fix for location vstats 2017-12-24 21:36:30 +03:00
Anton Reutov
a23ebfdd48
Minor fix for location vstats 2017-12-24 21:36:18 +03:00
Anton Reutov
6c331096eb
Minor fix for location vstats 2017-12-24 21:36:14 +03:00
Anton Reutov
11bb57224c
Minor fix for location vstats 2017-12-24 21:36:08 +03:00
Anton Reutov
e8ddbbfbb1
Minor fix for location vstats 2017-12-24 21:36:04 +03:00
Anton Reutov
ddfb496773
Minor fix for location vstats 2017-12-24 21:35:52 +03:00
Anton Reutov
05c9905738
Minor fix for location vstats 2017-12-24 21:35:49 +03:00
Anton Reutov
8882de780a
Minor fix for location vstats 2017-12-24 21:35:46 +03:00
Anton Reutov
810562428a
Minor fix for location vstats 2017-12-24 21:35:33 +03:00
Anton Reutov
89972acf95
Minor fix for location vstats 2017-12-24 21:35:28 +03:00
Anton Reutov
c22f9e9bdc
Minor fix for location vstats 2017-12-24 21:35:24 +03:00
Anton Reutov
af2de0377c
Minor fix for location vstats 2017-12-24 21:35:21 +03:00
Anton Reutov
34e9998fda
Minor fix for location vstats 2017-12-24 21:28:45 +03:00
Anton Reutov
92476ff512
Minor fix for location vstats 2017-12-24 21:28:41 +03:00
Anton Reutov
d3f626cff1
Minor fix for location vstats 2017-12-24 21:28:34 +03:00
Anton Reutov
f107270195
Minor fix for location vstats 2017-12-24 21:28:30 +03:00
Anton Reutov
6f4b227028
Minor fix for location vstats 2017-12-24 21:28:27 +03:00
Serghey Rodin
a7d45ac6e4 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-24 20:27:58 +02:00
Serghey Rodin
34c6ee93b9 fix for multiple init scripts 2017-12-24 20:27:45 +02:00
Anton Reutov
0aa17dc749
Minor fix for location vstats 2017-12-24 21:26:40 +03:00
Anton Reutov
8a3babe406
Minor fix for location vstats 2017-12-24 21:26:34 +03:00
Anton Reutov
1ded551dc0
Minor fix for location vstats 2017-12-24 21:26:30 +03:00
Anton Reutov
36d4a73bb2
Minor fix for location vstats 2017-12-24 21:26:26 +03:00
Anton Reutov
eab896adf8
Minor fix for location vstats 2017-12-24 21:26:21 +03:00
Anton Reutov
014da894ec
Minor fix for location vstats 2017-12-24 21:26:17 +03:00
Anton Reutov
832ce77c54
Minor fix for location vstats 2017-12-24 21:26:13 +03:00
Anton Reutov
88d5a4aeb1
Minor fix for location vstats 2017-12-24 21:26:09 +03:00
Anton Reutov
f68a8cf936
Minor fix for location vstats 2017-12-24 21:26:04 +03:00
Anton Reutov
f62d95a296
Minor fix for location vstats 2017-12-24 21:26:00 +03:00
Anton Reutov
f4d969136b
Minor fix for location vstats 2017-12-24 21:25:56 +03:00
Anton Reutov
fb41566ae4
Minor fix for location vstats 2017-12-24 21:25:52 +03:00
Anton Reutov
0acdb6c15b
Minor fix for location vstats 2017-12-24 21:25:49 +03:00
Anton Reutov
9b983be91d
Minor fix for location vstats 2017-12-24 21:20:49 +03:00
Anton Reutov
e96d21cc44
Minor fix for location vstats 2017-12-24 21:20:45 +03:00
Anton Reutov
2d63a96289
Minor fix for location vstats 2017-12-24 21:20:41 +03:00
Anton Reutov
8459133070
Minor fix for location vstats 2017-12-24 21:20:35 +03:00
Anton Reutov
cf73e9e719
Minor fix for location vstats 2017-12-24 21:20:31 +03:00
Anton Reutov
37551772fb
Minor fix for location vstats 2017-12-24 21:20:27 +03:00
Anton Reutov
a23f94db2f
Minor fix for location vstats 2017-12-24 21:20:22 +03:00
Anton Reutov
3b84512e0b
Minor fix for location vstats 2017-12-24 21:20:15 +03:00
Anton Reutov
3f4fda7a49
Minor fix for location vstats 2017-12-24 21:20:11 +03:00
Anton Reutov
801ccc6abb
Minor fix for location vstats 2017-12-24 21:20:08 +03:00
Anton Reutov
be66e4a32e
Minor fix for location vstats 2017-12-24 21:17:40 +03:00
Anton Reutov
86f260a8dd
Minor fix for location vstats 2017-12-24 21:16:15 +03:00
Anton Reutov
c13dc8aaad
Minor fix for location vstats 2017-12-24 21:15:52 +03:00
Anton Reutov
078605c2f3
Minor fix for location vstats 2017-12-24 21:15:40 +03:00
Anton Reutov
45de8443e0
Minor fix for location vstats 2017-12-24 21:15:33 +03:00
Anton Reutov
b23c43fc61
Minor fix for location vstats 2017-12-24 21:15:29 +03:00
Anton Reutov
18fbc90eaf
Minor fix for location vstats 2017-12-24 21:15:21 +03:00
Anton Reutov
41c694f071
Minor fix for location vstats 2017-12-24 21:13:08 +03:00
Anton Reutov
112106182f
Minor fix for location vstats 2017-12-24 21:13:03 +03:00
Anton Reutov
fc5ad2350e
Minor fix for location vstats 2017-12-24 21:12:56 +03:00
Anton Reutov
0a64f3a3d3
Minor fix for location vstats 2017-12-24 21:12:50 +03:00
Anton Reutov
0588770792
Minor fix for location vstats 2017-12-24 21:12:32 +03:00
Anton Reutov
2db6ba9918
Minor fix for location vstats 2017-12-24 21:12:28 +03:00
Anton Reutov
70d2ef06da
Minor fix for location vstats 2017-12-24 21:12:25 +03:00
Anton Reutov
27d71b28f7
Minor fix for location vstats 2017-12-24 21:12:21 +03:00
Anton Reutov
8fefe4546e
Minor fix for location vstats 2017-12-24 21:12:17 +03:00
Anton Reutov
343543e850
Minor fix for location vstats 2017-12-24 21:12:05 +03:00
Anton Reutov
a04e0c3868
Minor fix for location vstats 2017-12-24 21:12:01 +03:00
Anton Reutov
30c3aaba98
Minor fix for location vstats 2017-12-24 21:11:57 +03:00
Anton Reutov
ff99e4614d
Minor fix for location vstats 2017-12-24 21:11:53 +03:00
Anton Reutov
e52bf50064
Minor fix for location vstats 2017-12-24 21:09:18 +03:00
Anton Reutov
ba8f1d9c6e
Minor fix for location vstats 2017-12-24 21:09:04 +03:00
Anton Reutov
69884fc58c
Minor fix for location vstats 2017-12-24 21:08:20 +03:00
Anton Reutov
d939443d1a
Minor fix for location vstats 2017-12-24 21:08:12 +03:00
Anton Reutov
7d3cba1205
Minor fix for location vstats 2017-12-24 21:08:08 +03:00
Anton Reutov
5b9e275ced
Minor fix for location vstats 2017-12-24 21:08:04 +03:00
Anton Reutov
7ff936da8e
Minor fix for location vstats 2017-12-24 21:07:57 +03:00
Anton Reutov
ad28e5976b
Minor fix for location vstats 2017-12-24 21:07:52 +03:00
Anton Reutov
0addb91744
Minor fix for location vstats 2017-12-24 21:07:49 +03:00
Anton Reutov
fe6b894fe6
Minor fix for location vstats 2017-12-24 21:07:39 +03:00
Anton Reutov
95251626b0
Minor fix for location vstats 2017-12-24 21:07:35 +03:00
Anton Reutov
0c121ecc6c
Minor fix for location vstats 2017-12-24 21:07:31 +03:00
Anton Reutov
41281bcece
Minor fix for location vstats 2017-12-24 21:07:28 +03:00
Anton Reutov
fa4a4468b5
Minor fix for location vstats 2017-12-24 21:01:51 +03:00
Anton Reutov
4c5a0e6ec0
Minor fix for location vstats 2017-12-24 21:01:41 +03:00
Anton Reutov
1c40b8f657
Minor fix for location vstats 2017-12-24 21:01:37 +03:00
Anton Reutov
af63329c0a
Minor fix for location vstats 2017-12-24 21:01:34 +03:00
Anton Reutov
c6e525ebda
Minor fix for location vstats 2017-12-24 21:01:30 +03:00
Anton Reutov
102b7ecece
Minor fix for location vstats 2017-12-24 21:01:27 +03:00
Anton Reutov
95fff9b58d
Minor fix for location vstats 2017-12-24 21:01:19 +03:00
Anton Reutov
e235746055
Minor fix for location vstats 2017-12-24 21:01:13 +03:00
Anton Reutov
2b5e397c49
Minor fix for location vstats 2017-12-24 20:57:48 +03:00
Anton Reutov
2fcf41b8cd
Minor fix for location vstats 2017-12-24 20:57:08 +03:00
Anton Reutov
c772626a02
Minor fix for location vstats 2017-12-24 20:57:04 +03:00
Anton Reutov
2f9f63a8ed
Minor fix for location vstats 2017-12-24 20:56:48 +03:00
Anton Reutov
623fe4f57d
Minor fix for location vstats 2017-12-24 20:56:41 +03:00
Anton Reutov
a6b8868897
Minor fix for location vstats 2017-12-24 20:56:35 +03:00
Anton Reutov
b87bba2301
Minor fix for location vstats 2017-12-24 20:56:22 +03:00
Anton Reutov
3c1e36372a
Minor fix for location vstats 2017-12-24 20:56:18 +03:00
Anton Reutov
e7d5867d7c
Minor fix for location vstats 2017-12-24 20:56:15 +03:00
Anton Reutov
42b6aaa060
Minor fix for location vstats 2017-12-24 20:56:04 +03:00
Anton Reutov
73e8e37c9c
Minor fix for location vstats 2017-12-24 20:55:59 +03:00
Anton Reutov
fabe81931f
Minor fix for location vstats 2017-12-24 20:55:45 +03:00
Anton Reutov
2f3ce1ebf5
Minor fix for location vstats 2017-12-24 20:55:39 +03:00
Anton Reutov
01509d34fc
Minor fix for location vstats 2017-12-24 20:51:09 +03:00
Anton Reutov
f8bc0b6bde
Minor fix for location vstats 2017-12-24 20:51:03 +03:00
Anton Reutov
f107b95abb
Minor fix for location vstats 2017-12-24 20:50:57 +03:00
Anton Reutov
d3abb41f33
Minor fix for location vstats 2017-12-24 20:46:09 +03:00
Anton Reutov
60dc793dac
Minor fix for location vstats 2017-12-24 20:45:55 +03:00
Anton Reutov
affc328a5e
Minor fix for location vstats 2017-12-24 20:45:46 +03:00
Anton Reutov
69e68341e5
Minor fix for location vstats 2017-12-24 20:45:39 +03:00
Anton Reutov
06d628ad15
Minor fix for location vstats 2017-12-24 20:45:32 +03:00
Anton Reutov
1bd895e66d
Minor fix for location vstats 2017-12-24 20:45:25 +03:00
Anton Reutov
4e237d68a9
Minor fix for location vstats 2017-12-24 20:45:14 +03:00
Anton Reutov
9edc9dfd02
Minor fix for location vstats 2017-12-24 20:45:04 +03:00
Anton Reutov
7ea0814d37
Minor fix for location vstats 2017-12-24 20:44:47 +03:00
Anton Reutov
fefcacfd80
Minor fix for location vstats 2017-12-24 20:44:37 +03:00
Anton Reutov
76b5a440e2
Minor fix for location vstats 2017-12-24 20:44:28 +03:00
Anton Reutov
cd2baecd5e
Minor fix for location vstats 2017-12-24 20:44:19 +03:00
Anton Reutov
458d622a91
Minor fix for location vstats 2017-12-24 20:44:11 +03:00
Anton Reutov
c3ded9c196
Minor fix for location vstats 2017-12-24 20:44:01 +03:00
Anton Reutov
0390f2fd91
Minor fix for location vstats 2017-12-24 20:41:05 +03:00
Anton Reutov
540d068e1a
Minor fix for location vstats 2017-12-24 20:40:54 +03:00
Anton Reutov
8b778bdf1a
Minor fix for location vstats 2017-12-24 20:40:41 +03:00
Anton Reutov
07dff0721e
Minor fix for location vstats 2017-12-24 20:40:29 +03:00
Anton Reutov
5c89e35a61
Minor fix for location vstats 2017-12-24 18:35:47 +03:00
Anton Reutov
c07e0a673c
Minor fix for location vstats 2017-12-24 18:35:19 +03:00
Anton Reutov
d6b075195d
Minor fix for location vstats 2017-12-24 18:33:45 +03:00
Anton Reutov
81a764c7f9
Minor fix for location vstats 2017-12-24 18:32:00 +03:00
Serghey Rodin
7d956abd59 Softaculous enable/disable scripts 2017-12-21 19:18:00 +02:00
Mos GH
d4e405b1fa Added updating .my.cnf file when changing root password 2017-12-21 09:43:04 -05:00
Serghey Rodin
8dd1d4d581 added dependency for ioncube package 2017-12-21 16:30:46 +02:00
Serghey Rodin
0c49373f01 changed default action name from install to add 2017-12-21 15:45:59 +02:00
Serghey Rodin
3c3bc981ee removed post install routine for softaculous 2017-12-21 15:44:39 +02:00
Serghey Rodin
42f6ceddc4 enable/disable softaculous plugin 2017-12-21 12:19:01 +02:00
Serghey Rodin
fbc0cf5151 Apps panel 2017-12-21 12:15:52 +02:00
Serghey Rodin
c76ee85dac Deb package for softaculous 2017-12-20 17:40:19 +02:00
Serghey Rodin
1132a5aa7a Improved softaculous.spec 2017-12-20 17:39:50 +02:00
Serghey Rodin
286f29baff Softaculous spec for RPM based systems 2017-12-20 16:55:28 +02:00
Joe Mattos
468be0aaa4
fix annoying rebuild error 2017-12-17 04:24:22 -05:00
Serghey Rodin
e6d91682a8 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-13 14:26:16 +02:00
Serghey Rodin
3e63e92279 fixed typo: PROXY_YSTEM instead of PROXY_SYSTEM 2017-12-13 14:26:01 +02:00
Anton Reutov
4f94d64095
PROXY_YSTEM => PROXY_SYSTEM 2017-12-13 12:52:50 +03:00
Serghey Rodin
7fdcbfe363 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-11 18:42:52 +02:00
Serghey Rodin
3615b38fbf improved ioncube package specs 2017-12-11 18:42:28 +02:00
Serghey Rodin
e6d6fc7de1
Merge pull request #1209 from joubertredrat/524-letsencrypt-public_shtml
Fix on ssl home definition on Lets Encrypt cert renew
2017-12-11 18:38:50 +02:00
Joe Mattos
0277d84fe4
improve fail2ban support for vsftpd 2017-12-11 07:47:50 -05:00
Joe Mattos
92a4c2f377
improved fail2ban support for vsftpd 2017-12-11 03:14:29 -05:00
Serghey Rodin
3fbd3014c7 fix for new domain deletetion 2017-12-08 13:50:51 +02:00
dpeca
a30f510336
/web/edit/mail/index.php: fix for new lines in autoreply
Because JSON is properly escaped now, see a8d857f6d5
2017-12-07 17:28:16 +01:00
dpeca
a8d857f6d5
v-list-mail-account-autoreply: JSON export function fix for quotes and backslash 2017-12-07 17:23:13 +01:00
Serghey Rodin
f8be208fa3 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-07 15:04:55 +02:00
Serghey Rodin
4053f9ac5d New style for web configs / separate conf per domain 2017-12-07 15:04:40 +02:00
Alexandr Loskutov
22d0fa1766
Merge pull request #1232 from myrevery/master
Update cn.php
2017-12-07 12:04:05 +02:00
dpeca
f619d61df7
Probably good idea to not to rebuild web domains if Apache is frontend web server 2017-12-07 08:05:25 +01:00
Serghey Rodin
d5f78d5aa2
Merge pull request #1237 from cmstew/cmstew-v-user-backup-patch
Update v-backup-user / Fix from @cmstew
2017-12-06 23:38:51 +02:00
Serghey Rodin
472a0f488a changing web server includes back to %domain% for better readability 2017-12-06 23:00:18 +02:00
Serghey Rodin
1b1622ee6f Fix for LE domain restore 2017-12-06 19:32:03 +02:00
Unknown
ff0d1b7787 Fixed FTP backups are creating empty zip files #515
Changed the ftp backup from active to passive mode in bin/v-backup-user
2017-12-06 11:16:59 +00:00
Serghey Rodin
97b9673021 Fix for leading dot domains 2017-12-05 18:01:41 +02:00
Serghey Rodin
cd21b31405 LetsEncrypt support for IDN domains 2017-12-04 19:34:34 +02:00
Serghey Rodin
b110596024 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-12-04 16:43:05 +02:00
dpeca
12759e1f23
Merge pull request #1362 from cdnmall/patch-1
fixed checkbox issue
2017-12-03 17:29:12 +01:00
Joe Mattos
21f944c375
fixed checkbox issue
checkbox to an array allowing it to pass all three Vesta packages instead of just one.
2017-12-03 08:37:53 -05:00
Edgaras Giedrė
a07c7b3af5
Add public IP in ftp config 2017-12-02 19:03:06 +02:00
Serghey Rodin
7a83b51e55 vsy u2Merge branch 'master' of github.com:serghey-rodin/vesta 2017-11-29 18:07:08 +02:00
Made I.T
3d6eb2c8ea
Update v-add-dns-record 2017-11-27 11:42:49 +01:00
Made I.T
d9686a59f2
Add CAA record to web template 2017-11-27 11:17:47 +01:00
Made I.T
2397137578
Add CAA record to is_dns_type_format_valid 2017-11-27 11:16:52 +01:00
Anton Reutov
3bb009f290
Merge pull request #1347 from lukapaunovic/patch-8
CF IPs update
2017-11-25 17:35:32 +03:00
Anton Reutov
028d5ede03
Merge pull request #1346 from lukapaunovic/patch-15
CF IPs update
2017-11-25 17:35:17 +03:00
Anton Reutov
4a11351603
Merge pull request #1345 from lukapaunovic/patch-14
CF IPs update
2017-11-25 17:35:01 +03:00
Anton Reutov
76f1519164
Merge pull request #1344 from lukapaunovic/patch-13
CF IPs update
2017-11-25 17:34:45 +03:00
Anton Reutov
9989cea422
Merge pull request #1343 from lukapaunovic/patch-12
CF IPs update
2017-11-25 17:34:03 +03:00
Anton Reutov
2cad91cf05
Merge pull request #1342 from lukapaunovic/patch-11
CF IPs Update
2017-11-25 17:33:48 +03:00
Anton Reutov
94ea297b0b
Merge pull request #1341 from lukapaunovic/patch-9
CF IPs update
2017-11-25 17:33:30 +03:00
Anton Reutov
7099b6dcdf
Merge pull request #1340 from lukapaunovic/patch-7
CF IPs update
2017-11-25 17:32:47 +03:00
Anton Reutov
79da15cbf2
Merge pull request #1339 from lukapaunovic/patch-6
CF IPs update
2017-11-25 17:32:34 +03:00
Anton Reutov
d9a54d9bf6
Merge pull request #1338 from lukapaunovic/patch-4
Latest CF IPs update
2017-11-25 17:31:43 +03:00
Anton Reutov
6d4c1200f3
Merge pull request #1337 from lukapaunovic/patch-3
Latest CF IPs update
2017-11-25 17:31:10 +03:00
Anton Reutov
ad8d024faf
Merge pull request #1336 from lukapaunovic/patch-2
CloudFlare IPs update
2017-11-25 17:30:36 +03:00
Anton Reutov
62ff26c904
Merge pull request #1335 from lukapaunovic/patch-1
Latest CF IPs update
2017-11-25 17:28:55 +03:00
Luka Paunović
1d1203ab3e
CF IPs update 2017-11-25 14:49:07 +01:00
Luka Paunović
aed816de25
CF IPs update 2017-11-25 14:48:47 +01:00
Luka Paunović
fcae12bb72
CF IPs update 2017-11-25 14:48:08 +01:00
Luka Paunović
366e8e86c1
CF IPs update 2017-11-25 14:47:37 +01:00
Luka Paunović
633981ac15
CF IPs Update 2017-11-25 14:47:04 +01:00
Luka Paunović
db8af9edc4
CF IPs update 2017-11-25 14:45:55 +01:00
Luka Paunović
484bf518e8
CF IPs update 2017-11-25 14:45:28 +01:00
Luka Paunović
9012da12ca
CF IPs update 2017-11-25 14:44:57 +01:00
Luka Paunović
ab78410dde
CF IPs update 2017-11-25 14:44:11 +01:00
Luka Paunović
ddf67efba7
Latest CF IPs update 2017-11-25 14:42:07 +01:00
Luka Paunović
03843d580a
Latest CF IPs update 2017-11-25 14:41:34 +01:00
Luka Paunović
84d2567c74
CloudFlare IPs update 2017-11-25 14:40:43 +01:00
Luka Paunović
fc0aaedaf7
Latest CF IPs update
Latest CF IPs update
2017-11-25 14:39:59 +01:00
Serghey Rodin
b2144016dc Merge branch 'master' of github.com:serghey-rodin/vesta 2017-11-21 17:58:44 +02:00
Serghey Rodin
757e065602 security fix / thanks to Christopher Tarquini 2017-11-21 17:58:16 +02:00
Anton Reutov
0a934d93b9
New template for OpenCart CMS 2017-11-21 02:33:54 +03:00
Anton Reutov
f7073ad995
New template for OpenCart CMS 2017-11-21 02:33:27 +03:00
Anton Reutov
ce676dc620
New template for OpenCart CMS 2017-11-21 02:32:39 +03:00
Anton Reutov
603a783a10
New template for OpenCart CMS 2017-11-21 02:32:08 +03:00
Anton Reutov
cc8c395c1a
New template for OpenCart CMS 2017-11-21 02:31:13 +03:00
Anton Reutov
b8b8115e38
New template for OpenCart CMS 2017-11-21 02:30:30 +03:00
Anton Reutov
8a7d620204
New template for OpenCart CMS 2017-11-21 02:28:08 +03:00
Anton Reutov
9d43bcbdac
New template for OpenCart CMS 2017-11-21 02:27:29 +03:00
Anton Reutov
c6e96ac4bd
New template for OpenCart CMS 2017-11-21 02:25:56 +03:00
Anton Reutov
6646d22169
New template for OpenCart CMS 2017-11-21 02:25:28 +03:00
Anton Reutov
b635f1694d
New template for OpenCart CMS 2017-11-21 02:24:18 +03:00
Anton Reutov
5158cdcb3d
New template for OpenCart CMS 2017-11-21 02:23:21 +03:00
Anton Reutov
5a80d18744
New template for OpenCart CMS 2017-11-21 02:19:50 +03:00
Anton Reutov
7f00a9d9b6
New template for OpenCart CMS 2017-11-21 02:19:21 +03:00
Anton Reutov
456a118db7
New template for OpenCart CMS 2017-11-21 02:18:12 +03:00
Anton Reutov
76478dc18d
New template for OpenCart CMS 2017-11-21 02:17:48 +03:00
Anton Reutov
9beecc7a9e
New template for OpenCart CMS 2017-11-21 02:16:38 +03:00
Anton Reutov
3c85792a8b
New template for OpenCart CMS 2017-11-21 02:16:14 +03:00
Anton Reutov
12dbf39a14
New template for OpenCart CMS 2017-11-21 02:14:28 +03:00
Anton Reutov
a4368d1037
New template for OpenCart CMS 2017-11-21 02:14:00 +03:00
Anton Reutov
7af86f53c0
New template for OpenCart CMS 2017-11-21 02:11:55 +03:00
Anton Reutov
158e9cb96e
New template for OpenCart CMS 2017-11-21 02:11:26 +03:00
Anton Reutov
520e2fa4cd
New template for OpenCart CMS 2017-11-21 02:09:48 +03:00
Anton Reutov
cf6cf42fa0
New template for OpenCart CMS 2017-11-21 02:09:18 +03:00
Anton Reutov
fd0b3dd66b
New template for OpenCart CMS 2017-11-20 22:11:59 +03:00
Anton Reutov
968a7a8729
New template for OpenCart CMS 2017-11-20 22:11:26 +03:00
Anton Reutov
da54653fe1
New template for OpenCart CMS 2017-11-20 22:10:09 +03:00
Anton Reutov
d578912cfb
New template for OpenCart CMS 2017-11-20 22:09:43 +03:00
Anton Reutov
f279b0d97c
New template for OpenCart CMS 2017-11-20 22:08:26 +03:00
Anton Reutov
9dc5220ab2
New template for OpenCart CMS 2017-11-20 22:07:14 +03:00
dpeca
f3e9d1fd64
Merge pull request #1332 from mikorist/patch-1, debian8 nginx.conf fix
Update nginx.conf
2017-11-20 17:07:30 +01:00
dpeca
43fdf7a1cc
blank space indent fix 2017-11-20 17:06:01 +01:00
mikorist
503a2df590
Update nginx.conf
Added 
timer_resolution         50ms; 
In order to free some CPU cycles

Updated Cloudflare's IP addresses
2017-11-20 16:57:18 +01:00
dpeca
ba14a64499
Fix in v-update-host-certificate: added restart for dovecot 2017-11-15 14:05:25 +01:00
Anton Reutov
dd9f507770
Merge pull request #1323 from moucho/permissions
Correct permissions for index.html and robots.txt on new added web domain
2017-11-15 12:26:35 +03:00
Marcos
c6b5125e84 Better permissions for web files 2017-11-15 02:17:42 +01:00
Robin Dirksen
f8368220ff Backup filename changed (#1289)
* Backup filename changed

Changed the backup filename for running more backup each day - for example every 4 hours

* Restore user fix with new backup date

* Check if the backup name has an old notation

* Fix backup permission check

* fixed regex

* fix
2017-11-13 17:22:44 +03:00
Marcos
0be2a0327e Permissions for web files 2017-11-13 12:10:26 +01:00
dpeca
fc60a99e8c
v-update-host-certificate fix: restarting vesta instead of web-backend 2017-11-12 23:36:28 +01:00
dpeca
38b7557beb Securing v-update-host-certificate and few small fixes 2017-11-12 23:09:42 +01:00
dpeca
9decddd657
Merge pull request #1317 from robindirksen1/patch-4
Create v-update-host-certificate
2017-11-12 22:13:42 +01:00
dpeca
ae84137c12
Merge pull request #1315 from darkworks/urdu_language_translation
Urdu language translation
2017-11-10 14:00:10 +01:00
Robin Dirksen
593cd34e52
Create v-update-host-certificate
Add a file that's setting the hostname certificate for exim, dovecot & vesta-web so the email is always with a valid LE certificate.

# Todo:
- add to cronjobs (default every month) of adds to lets encrypt renewall/request when updating system hostname certificate
2017-11-07 11:56:59 +01:00
darkworks
d454c87a75
Update ur.php 2017-11-02 20:48:17 +05:00
darkworks
3b96946c40
Update v-extract-fs-archive 2017-11-02 12:08:24 +05:00
darkworks
5259ad7c3b
ur.ph update
added 'Email Credentials' => 'ای میل کی سند',
2017-11-02 11:55:42 +05:00
Anton Reutov
1b3a30d1ee
Merge pull request #1314 from crackerizer/master
Added Odoo web template
2017-11-01 18:56:56 +03:00
Phinitnan Chanasabaeng
397fdbbdfa Added Odoo web template, see Odoo's deployment at https://www.odoo.com/documentation/10.0/setup/deploy.html 2017-11-01 13:14:28 +07:00
dpeca
34eb4c1585
Merge pull request #1313 from guitarrist/patch-2
pt-Br translation corrections
2017-10-31 17:38:57 +01:00
Antônio Oliveira
94c6bdfbdc
pt-Br translation corrections
Corrected words:
Email => E-mail (https://www.dicio.com.br/e-mail/)
Dominio => Domínio
Extenções  => Extensões
Mes => Mês

+ Added translation for "Email Credentials".
2017-10-30 17:43:53 -02:00
darkworks
577939610d
ur.php
translation of vesta eng file to urdu language.
2017-10-30 09:51:07 +05:00
Made I.T
8867d8ec65 #1311 2017-10-26 12:49:14 +02:00
Anton Karmanov
d68c8f6964 Spread new func on deb install scripts 2017-10-24 16:23:37 +05:00
Anton Karmanov
c8c9927377 New function to set default lang 2017-10-24 15:47:38 +05:00
Made I.T
6574b7c481 Merge pull request #1306 from robindirksen1/patch-3
Fixed correct dutch sentences
2017-10-23 12:33:19 +02:00
Robin Dirksen
39a12a0b48 Fixed correct dutch sentences 2017-10-23 12:15:14 +02:00
dpeca
8b3d2f0aa1 Merge pull request #1236 from twoup/patch-1
Fix issue in v-letsencrypt-add-user
2017-10-22 02:28:40 +02:00
Hidayet Ok
d13ed39054 Duplicate interface name detection fix
When you install Vesta on Hetzner centos7 installation fails and returns error like this : "Error: user enp0s31f6 doesn't exist"

Network interface name finding mechanism returns 2 word and v-add-sys-ip command fails. 

/usr/local/vesta/bin/v-add-sys-ip 88.99.141.40 255.255.255.255 enp0s31f6 enp0s31f6
2017-10-20 03:01:58 +03:00
dpeca
e757da763f v-update-letsencrypt-ssl: better position for sleep 10
Related to issue https://github.com/serghey-rodin/vesta/issues/1193
2017-10-18 18:58:58 +02:00
dpeca
51bff426dc v-update-letsencrypt-ssl: wait 10 sec only when renewing 2017-10-18 18:49:09 +02:00
Made I.T
5914dbe092 Merge pull request #1303 from robindirksen1/patch-2
Fixed dutch translation
2017-10-17 09:23:54 +02:00
Robin Dirksen
e1dd3ceb75 Fixed dutch translation 2017-10-17 09:15:10 +02:00
Anton Reutov
bf29d869e1 Merge pull request #1301 from robingroppe/patch-1
Update de.php
2017-10-15 18:56:09 +03:00
Robin Groppe
ab20b69efc Update de.php
Typo in Username
2017-10-15 17:17:15 +02:00
Anton Reutov
e4316a5139 Merge pull request #1292 from robindirksen1/patch-1
Fixed dutch language
2017-10-09 13:31:10 +03:00
Robin Dirksen
270a1353f2 Fixed dutch language
Fixed untranslated english strings & changed "je" to "u" for formal texts
2017-10-09 10:35:27 +02:00
Anton Reutov
5f99045f90 Minor fix for stpl templates 2017-10-06 00:31:40 +03:00
Anton Reutov
3e62cd8c15 Minor fix for stpl templates 2017-10-06 00:31:32 +03:00
Anton Reutov
cc19bbebc1 Minor fix for stpl templates 2017-10-06 00:31:24 +03:00
Anton Reutov
0553b3a4a0 Minor fix for stpl templates 2017-10-06 00:31:16 +03:00
Anton Reutov
109829e6b8 Minor fix for stpl templates 2017-10-06 00:30:49 +03:00
Anton Reutov
6d19fa9182 Minor fix for stpl templates 2017-10-06 00:30:33 +03:00
Anton Reutov
85fb1cc875 Minor fix for stpl templates 2017-10-06 00:30:06 +03:00
Anton Reutov
aaf52100b8 Minor fix for stpl templates 2017-10-06 00:29:56 +03:00
Anton Reutov
66e2440c41 Minor fix for stpl templates 2017-10-06 00:29:36 +03:00
Anton Reutov
2a210cf149 Minor fix for stpl templates 2017-10-06 00:29:25 +03:00
Anton Reutov
c76caf468d Minor fix for stpl templates 2017-10-06 00:29:04 +03:00
Anton Reutov
e834459556 Minor fix for stpl templates 2017-10-06 00:28:55 +03:00
Anton Reutov
ce877ccb48 Minor fix for stpl templates 2017-10-06 00:28:39 +03:00
Anton Reutov
6e9f15d180 Minor fix for stpl templates 2017-10-06 00:28:32 +03:00
Anton Reutov
a85f60133a Minor fix for stpl templates 2017-10-06 00:27:27 +03:00
Anton Reutov
e19fbc3be6 Minor fix for stpl templates 2017-10-06 00:27:16 +03:00
Anton Reutov
38bdd9caca Minor fix for stpl templates 2017-10-06 00:26:56 +03:00
Anton Reutov
e56cc0d516 Minor fix for stpl templates 2017-10-06 00:26:41 +03:00
Anton Reutov
8dda1bd226 Minor fix for stpl templates 2017-10-06 00:23:26 +03:00
Anton Reutov
f4cd693f61 Minor fix for stpl templates 2017-10-06 00:23:17 +03:00
Anton Reutov
ced721a89c Minor fix for stpl templates 2017-10-06 00:23:07 +03:00
Anton Reutov
5b604b9490 Minor fix for stpl templates 2017-10-06 00:22:30 +03:00
Anton Reutov
682b41a8e7 Minor fix for stpl templates 2017-10-06 00:22:20 +03:00
Anton Reutov
47de72f757 Minor fix for stpl templates 2017-10-06 00:21:49 +03:00
Anton Reutov
5daba324b6 Minor fix for stpl templates 2017-10-06 00:21:31 +03:00
Anton Reutov
6f379b228d Minor fix for stpl templates 2017-10-06 00:21:24 +03:00
Anton Reutov
736e874570 Minor fix for stpl templates 2017-10-06 00:20:42 +03:00
Anton Reutov
3ac5864c35 Minor fix for stpl templates 2017-10-06 00:20:24 +03:00
Anton Reutov
888629b189 Minor fix for stpl templates 2017-10-06 00:20:10 +03:00
Anton Reutov
f740b900d9 Minor fix for stpl templates 2017-10-06 00:20:00 +03:00
Anton Reutov
2190a07a16 Minor fix for stpl templates 2017-10-06 00:19:36 +03:00
Anton Reutov
b127ee33c2 Minor fix for stpl templates 2017-10-06 00:19:25 +03:00
Anton Reutov
c7e7e26ce0 Minor fix for stpl templates 2017-10-06 00:19:17 +03:00
Anton Reutov
bb8274b46e Minor fix for stpl templates 2017-10-06 00:18:57 +03:00
Anton Reutov
1334a0312b Minor fix for stpl templates 2017-10-06 00:18:40 +03:00
Anton Reutov
cdc0b5cab6 Minor fix for stpl templates 2017-10-06 00:18:32 +03:00
Anton Reutov
f8bf02e661 Minor fix for stpl templates 2017-10-06 00:02:31 +03:00
Anton Reutov
1a84486b5b Minor fix for stpl templates 2017-10-06 00:02:21 +03:00
Anton Reutov
f0d364ba8d Minor fix for stpl templates 2017-10-06 00:02:11 +03:00
Anton Reutov
5895a2a404 Minor fix for stpl templates 2017-10-06 00:02:00 +03:00
Anton Reutov
f58fb2f2fc Minor fix for stpl templates 2017-10-06 00:01:46 +03:00
Anton Reutov
3d2b6accf8 Minor fix for stpl templates 2017-10-06 00:01:35 +03:00
Anton Reutov
2cec6931bd Minor fix for stpl templates 2017-10-06 00:01:15 +03:00
Anton Reutov
d7e48e9c5e Minor fix for stpl templates 2017-10-06 00:01:07 +03:00
Anton Reutov
fe66a6c691 Minor fix for stpl templates 2017-10-05 23:59:13 +03:00
Anton Reutov
46a9dfebda Minor fix for stpl templates 2017-10-05 23:58:54 +03:00
Anton Reutov
8c161831fa Minor fix for stpl templates 2017-10-05 23:58:42 +03:00
Anton Reutov
468386b3e9 Minor fix for stpl templates 2017-10-05 23:58:27 +03:00
Anton Reutov
01326cb56b Minor fix for stpl templates 2017-10-05 23:57:51 +03:00
Anton Reutov
c6bb6b91df Minor fix for stpl templates 2017-10-05 23:57:44 +03:00
Anton Reutov
28cbc29517 Minor fix for stpl templates 2017-10-05 23:57:26 +03:00
Anton Reutov
86f60c2131 Minor fix for stpl templates 2017-10-05 23:57:17 +03:00
Anton Reutov
c66b07f406 Minor fix for stpl templates 2017-10-05 23:57:03 +03:00
Anton Reutov
a0fa690e4b Minor fix for stpl templates 2017-10-05 23:56:56 +03:00
Anton Reutov
d4599a80ad Minor fix for stpl templates 2017-10-05 23:38:43 +03:00
Anton Reutov
d2b889d072 Minor fix for stpl templates 2017-10-05 23:38:32 +03:00
Anton Reutov
fa4dd094ab Minor fix for stpl templates 2017-10-05 23:38:20 +03:00
Anton Reutov
f19aec5a8f Minor fix for stpl templates 2017-10-05 23:38:04 +03:00
Anton Reutov
f9c38cfbfe Minor fix for stpl templates 2017-10-05 23:37:57 +03:00
Anton Reutov
e925d8375a Minor fix for stpl templates 2017-10-05 23:37:44 +03:00
Anton Reutov
a2acd3f3f3 Minor fix for stpl templates 2017-10-05 23:37:38 +03:00
Anton Reutov
f1f6bcb89e Minor fix for stpl templates 2017-10-05 23:37:19 +03:00
Anton Reutov
a8b08ebc9b Minor fix for stpl templates 2017-10-05 23:35:27 +03:00
Anton Reutov
ce85c77d06 Minor fix for stpl templates 2017-10-05 23:34:51 +03:00
Anton Reutov
98a0e6c656 Minor fix for stpl templates 2017-10-05 23:34:38 +03:00
Anton Reutov
9ae79e9754 Minor fix for stpl templates 2017-10-05 23:34:31 +03:00
Anton Reutov
aad5b0138d Minor fix for stpl templates 2017-10-05 23:34:19 +03:00
Anton Reutov
2c263ff98e Minor fix for stpl templates 2017-10-05 23:34:05 +03:00
Anton Reutov
3324303906 Minor fix for stpl templates 2017-10-05 23:33:53 +03:00
Anton Reutov
b8a63fe590 Minor fix for stpl templates 2017-10-05 23:32:51 +03:00
Anton Reutov
4c357adcde Minor fix for stpl templates 2017-10-05 23:32:21 +03:00
Anton Reutov
6e391e5403 Minor fix for stpl templates 2017-10-05 23:32:06 +03:00
Anton Reutov
439e574d05 Minor fix for stpl templates 2017-10-05 23:20:33 +03:00
Anton Reutov
f57b7b251e Minor fix for stpl templates 2017-10-05 23:20:22 +03:00
Anton Reutov
5a50ee9214 Minor fix for stpl templates 2017-10-05 23:20:08 +03:00
Anton Reutov
aab07aa877 Minor fix for stpl templates 2017-10-05 23:19:14 +03:00
Anton Reutov
cb404f5dda Minor fix for stpl templates 2017-10-05 23:18:46 +03:00
Anton Reutov
1dc5291f9f Minor fix for stpl templates 2017-10-05 23:18:33 +03:00
Anton Reutov
aa5371528e Minor fix for stpl templates 2017-10-05 23:18:04 +03:00
Anton Reutov
e8966c296d Minor fix for stpl templates 2017-10-05 23:17:39 +03:00
Anton Reutov
20e4bc4355 Minor fix for stpl templates 2017-10-05 23:17:08 +03:00
Anton Reutov
f1cf768d40 Minor fix for stpl templates 2017-10-05 23:16:48 +03:00
Anton Reutov
f69aae6a8c Minor fix for stpl templates 2017-10-05 23:16:37 +03:00
Anton Reutov
f2049a0942 Minor fix for stpl templates 2017-10-05 23:16:24 +03:00
Anton Reutov
7bb4a171fb Minor fix for stpl templates 2017-10-05 23:16:13 +03:00
Anton Reutov
6e128a84fe Minor fix for stpl templates 2017-10-05 23:14:17 +03:00
Anton Reutov
07ca1729dd Minor fix for stpl templates 2017-10-05 23:14:01 +03:00
Anton Reutov
8e134df562 Minor fix for stpl templates 2017-10-05 23:13:39 +03:00
Anton Reutov
92946b5404 Minor fix for stpl templates 2017-10-05 23:13:13 +03:00
Anton Reutov
8e9015dc07 Minor fix for stpl templates 2017-10-05 22:26:56 +03:00
Anton Reutov
81b8e8e4e5 Minor fix for stpl templates 2017-10-05 22:18:26 +03:00
Anton Reutov
f6a8092273 Minor fix for stpl templates 2017-10-05 22:18:18 +03:00
Anton Reutov
38215ef31d Minor fix for stpl templates 2017-10-05 22:18:07 +03:00
Anton Reutov
82e3b00c3b Minor fix for stpl templates 2017-10-05 22:17:59 +03:00
Anton Reutov
9a8c74578c Minor fix for stpl templates 2017-10-05 22:17:46 +03:00
Anton Reutov
f8b1e6d1d2 Minor fix for stpl templates 2017-10-05 22:17:38 +03:00
Anton Reutov
750a3a4bb3 Minor fix for stpl templates 2017-10-05 22:17:24 +03:00
Anton Reutov
b0bfdabc51 Minor fix for stpl templates 2017-10-05 22:17:15 +03:00
Anton Reutov
c11ef6374d Minor fix for stpl templates 2017-10-05 22:16:40 +03:00
Anton Reutov
d19784d614 Minor fix for stpl templates 2017-10-05 22:16:25 +03:00
Anton Reutov
c6a09e80f1 Minor fix for stpl templates 2017-10-05 22:16:19 +03:00
Anton Reutov
8523877098 Minor fix for stpl templates 2017-10-05 22:16:06 +03:00
Anton Reutov
357b9934b3 Minor fix for stpl templates 2017-10-05 22:15:55 +03:00
Anton Reutov
e76dee32e4 Minor fix for stpl templates 2017-10-05 22:15:41 +03:00
Anton Reutov
c7e15a9177 Minor fix for stpl templates 2017-10-05 22:15:29 +03:00
Anton Reutov
4c1665ca03 Minor fix for stpl templates 2017-10-05 22:15:14 +03:00
Anton Reutov
89c6aa1105 Minor fix for stpl templates 2017-10-05 22:15:08 +03:00
Anton Reutov
cd7055e32b Minor fix for stpl templates 2017-10-05 22:14:58 +03:00
Anton Reutov
735bef96af Minor fix for stpl templates 2017-10-05 22:10:59 +03:00
Anton Reutov
b5c6a6a2c5 Minor fix for stpl templates 2017-10-05 22:10:53 +03:00
Anton Reutov
dc0529a3f9 Minor fix for stpl templates 2017-10-05 22:10:35 +03:00
Anton Reutov
85eb2193d8 Minor fix for stpl templates 2017-10-05 22:10:28 +03:00
Anton Reutov
0b498e2172 Minor fix for stpl templates 2017-10-05 22:10:21 +03:00
Anton Reutov
2124032949 Minor fix for stpl templates 2017-10-05 22:10:07 +03:00
Anton Reutov
fb21016067 Minor fix for stpl templates 2017-10-05 22:10:00 +03:00
Anton Reutov
ecb856d1b1 Minor fix for stpl templates 2017-10-05 22:09:01 +03:00
Anton Reutov
0fcd2cd66e Minor fix for stpl templates 2017-10-05 22:08:45 +03:00
Anton Reutov
c8bbec075d Minor fix for stpl templates 2017-10-05 22:08:38 +03:00
Anton Reutov
9a647c94da Minor fix for stpl templates 2017-10-05 22:08:31 +03:00
Anton Reutov
6a93640af2 Minor fix for stpl templates 2017-10-05 22:08:24 +03:00
Anton Reutov
9eb11bf4bd Minor fix for stpl templates 2017-10-05 22:08:18 +03:00
Anton Reutov
2395c4ac4c Minor fix for stpl templates 2017-10-05 22:08:10 +03:00
Anton Reutov
fc732dba17 Minor fix for stpl templates 2017-10-05 22:07:59 +03:00
Anton Reutov
16ce8cd688 Minor fix for stpl templates 2017-10-05 22:07:42 +03:00
Anton Reutov
8a4736c561 Minor fix for stpl templates 2017-10-05 22:07:34 +03:00
Anton Reutov
d8310d377f Minor fix for stpl templates 2017-10-05 22:07:28 +03:00
Anton Reutov
333eb7c165 Minor fix for stpl templates 2017-10-05 22:03:43 +03:00
Anton Reutov
9b9ae28479 Minor fix for stpl templates 2017-10-05 22:03:33 +03:00
Anton Reutov
8dd9fce491 Minor fix for stpl templates 2017-10-05 22:03:19 +03:00
Anton Reutov
54dcba13ee Minor fix for stpl templates 2017-10-05 22:03:02 +03:00
Anton Reutov
41276d9cd4 Minor fix for stpl templates 2017-10-05 22:02:54 +03:00
Anton Reutov
0333323527 Minor fix for stpl templates 2017-10-05 22:02:46 +03:00
Anton Reutov
ab702a277a Minor fix for stpl templates 2017-10-05 22:02:06 +03:00
Anton Reutov
5665291597 Minor fix for stpl templates 2017-10-05 22:01:55 +03:00
Anton Reutov
1eba91ca4a Minor fix for stpl templates 2017-10-05 22:01:45 +03:00
Anton Reutov
585fe2580f Minor fix for stpl templates 2017-10-05 22:01:39 +03:00
Anton Reutov
341c9940d2 Minor fix for stpl templates 2017-10-05 22:01:14 +03:00
Anton Reutov
29242cb623 Minor fix for stpl templates 2017-10-05 22:00:57 +03:00
Anton Reutov
2c9bb976e4 Minor fix for stpl templates 2017-10-05 22:00:50 +03:00
Anton Reutov
63ca86c8a2 Minor fix for stpl templates 2017-10-05 22:00:36 +03:00
Anton Reutov
da82cdbcf0 Minor fix for stpl templates 2017-10-05 22:00:30 +03:00
Anton Reutov
ff0a2742c9 Minor fix for stpl templates 2017-10-05 21:59:27 +03:00
Anton Reutov
bd75199a98 Minor fix for stpl templates 2017-10-05 21:59:21 +03:00
Anton Reutov
efe4f48864 Minor fix for stpl templates 2017-10-05 21:59:13 +03:00
Anton Reutov
246d0425fe Minor fix for stpl templates 2017-10-05 21:56:32 +03:00
Anton Reutov
3871b9faec Minor fix for stpl templates 2017-10-05 21:56:25 +03:00
Anton Reutov
bb9fff78c3 Minor fix for stpl templates 2017-10-05 21:56:17 +03:00
Anton Reutov
790e9d48ae Update piwik.stpl 2017-10-05 21:56:11 +03:00
Anton Reutov
f1cb4fd4b8 Minor fix for stpl templates 2017-10-05 21:56:06 +03:00
Anton Reutov
1198ccc0bf Minor fix for stpl templates 2017-10-05 21:55:46 +03:00
Anton Reutov
0ce42d5665 Minor fix for stpl templates 2017-10-05 21:55:40 +03:00
Anton Reutov
e4e10e7780 Minor fix for stpl templates 2017-10-05 21:55:33 +03:00
Anton Reutov
98c318757c Minor fix for stpl templates 2017-10-05 21:54:47 +03:00
Anton Reutov
f13078d153 Minor fix for stpl templates 2017-10-05 21:54:25 +03:00
Anton Reutov
f6bb2b1268 Minor fix for stpl templates 2017-10-05 21:54:18 +03:00
Anton Reutov
0bd4257a21 Minor fix for stpl templates 2017-10-05 21:54:12 +03:00
Anton Reutov
736b742617 Minor fix for stpl templates 2017-10-05 21:53:51 +03:00
Anton Reutov
77e39e67d7 Minor fix for stpl templates 2017-10-05 21:53:41 +03:00
Anton Reutov
96c8be59ca Minor fix for stpl templates 2017-10-05 21:53:30 +03:00
Anton Reutov
3435d02e0a Minor fix for stpl templates 2017-10-05 21:53:22 +03:00
Anton Reutov
9f7dd8e933 Minor fix for stpl templates 2017-10-05 21:52:50 +03:00
Anton Reutov
9511a9da2c Minor fix for stpl templates 2017-10-05 21:52:38 +03:00
Anton Reutov
538401d5b9 Minor fix for stpl templates 2017-10-05 21:49:19 +03:00
Anton Reutov
e3baedf9d9 Minor fix for stpl templates 2017-10-05 21:48:56 +03:00
Anton Reutov
14257ab8bc Minor fix for stpl templates 2017-10-05 21:48:26 +03:00
Anton Reutov
f5732a2d2b Minor fix for stpl templates 2017-10-05 21:47:59 +03:00
Anton Reutov
da89afbd5c Minor fix for stpl templates 2017-10-05 21:47:52 +03:00
Anton Reutov
940dfa9b6e Minor fix for stpl templates 2017-10-05 21:26:02 +03:00
Anton Reutov
34f2bbdbf6 Minor fix for stpl templates 2017-10-05 21:25:34 +03:00
Anton Reutov
8dd5096773 Minor fix for stpl templates 2017-10-05 21:25:25 +03:00
Anton Reutov
83776301ef Minor fix for stpl templates 2017-10-05 21:24:26 +03:00
Anton Reutov
8f4749eca5 Minor fix for stpl templates 2017-10-05 21:24:14 +03:00
Anton Reutov
e5e8cfc3ea Minor fix for stpl templates 2017-10-05 21:23:43 +03:00
Anton Reutov
c6e8dd40fd Minor fix for stpl templates 2017-10-05 21:23:33 +03:00
Anton Reutov
e9854a7c6e Minor fix for stpl templates 2017-10-05 21:23:22 +03:00
Anton Reutov
c799384673 Minor fix for stpl templates 2017-10-05 21:23:01 +03:00
Anton Reutov
0dc6b2612d Minor fix for stpl templates 2017-10-05 21:22:51 +03:00
Anton Reutov
b2b9c47f22 Minor fix for stpl templates 2017-10-05 21:22:27 +03:00
Anton Reutov
6c360fe040 Minor fix for stpl templates 2017-10-05 21:22:16 +03:00
Anton Reutov
e24cb89aa9 Minor fix for stpl templates 2017-10-05 21:22:09 +03:00
Anton Reutov
96e0cd4fd5 Minor fix for stpl templates 2017-10-05 21:16:07 +03:00
Anton Reutov
a3f5f59e50 Minor fix for stpl templates 2017-10-05 21:16:00 +03:00
Anton Reutov
726d4a4d9a Minor fix for stpl templates 2017-10-05 21:15:50 +03:00
Anton Reutov
ed56184631 Minor fix for stpl templates 2017-10-05 21:15:34 +03:00
Anton Reutov
76a297ad3c Minor fix for stpl templates 2017-10-05 21:15:08 +03:00
Anton Reutov
8d3fbe07a8 Minor fix for stpl templates 2017-10-05 21:15:00 +03:00
Anton Reutov
5183348a0b Minor fix for stpl templates 2017-10-05 21:14:44 +03:00
Anton Reutov
a2af7ee8a7 Minor fix for stpl templates 2017-10-05 21:14:36 +03:00
Anton Reutov
6a2f19a7ee Minor fix for stpl templates 2017-10-05 21:13:49 +03:00
Anton Reutov
22b303d4eb Minor fix for stpl templates 2017-10-05 21:13:04 +03:00
Anton Reutov
915b303fb4 Minor fix for stpl templates 2017-10-05 21:12:57 +03:00
Anton Reutov
1755ee1fb5 Minor fix for stpl templates 2017-10-05 21:12:42 +03:00
Anton Reutov
4aa4f13e99 Minor fix for stpl templates 2017-10-05 21:12:27 +03:00
Anton Reutov
da716d1b76 Minor fix for stpl templates 2017-10-05 21:12:19 +03:00
Anton Reutov
d78b3a02fd Minor fix for stpl templates 2017-10-05 21:12:07 +03:00
Anton Reutov
a49fa485e7 Minor fix for stpl templates 2017-10-05 21:11:49 +03:00
Anton Reutov
b2293c11a6 Minor fix for stpl templates 2017-10-05 21:11:38 +03:00
Anton Reutov
752eb541f2 Minor fix for stpl templates 2017-10-05 21:11:30 +03:00
Anton Reutov
7707833899 Minor fix for stpl templates 2017-10-05 21:00:54 +03:00
Anton Reutov
2cc235c0a8 Minor fix for stpl templates 2017-10-05 21:00:47 +03:00
Anton Reutov
a3df2c361a Minor fix for stpl templates 2017-10-05 21:00:32 +03:00
Anton Reutov
8657acc547 Minor fix for stpl templates 2017-10-05 21:00:25 +03:00
Anton Reutov
172b57cf7f Minor fix for stpl templates 2017-10-05 21:00:10 +03:00
Anton Reutov
4cc09b8c88 Minor fix for stpl templates 2017-10-05 20:59:59 +03:00
Anton Reutov
10536c4bc0 Minor fix for stpl templates 2017-10-05 20:59:42 +03:00
Anton Reutov
8282082d34 Minor fix for stpl templates 2017-10-05 20:59:19 +03:00
Anton Reutov
955ba58321 Minor fix for stpl templates 2017-10-05 20:58:27 +03:00
Anton Reutov
3b1f465a25 Minor fix for stpl templates 2017-10-05 20:58:20 +03:00
Anton Reutov
e582080c11 Minor fix for stpl templates 2017-10-05 20:57:00 +03:00
Anton Reutov
70594897de Minor fix for stpl templates 2017-10-05 20:56:52 +03:00
Anton Reutov
6088c726ca Minor fix for stpl templates 2017-10-05 20:56:44 +03:00
Anton Reutov
4ab5704763 Minor fix for stpl templates 2017-10-05 20:56:30 +03:00
Anton Reutov
2270354963 Minor fix for stpl templates 2017-10-05 20:56:16 +03:00
Anton Reutov
de681a3d96 Minor fix for stpl templates 2017-10-05 20:56:03 +03:00
Anton Reutov
2c62ed307e Minor fix for stpl templates 2017-10-05 20:55:45 +03:00
Anton Reutov
30352e2e81 Minor fix for stpl templates 2017-10-05 20:55:26 +03:00
Anton Reutov
7a60cb5942 Minor fix for stpl templates 2017-10-05 20:52:12 +03:00
Anton Reutov
57e2e347bb Minor fix for stpl templates 2017-10-05 20:51:55 +03:00
Anton Reutov
1376987f70 Minor fix for stpl templates 2017-10-05 20:51:43 +03:00
Anton Reutov
a4b6518ef4 Minor fix for stpl templates 2017-10-05 20:51:18 +03:00
Anton Reutov
6bf3f8b125 Minor fix for stpl templates 2017-10-05 20:51:11 +03:00
Anton Reutov
38c1b4422a Minor fix for stpl templates 2017-10-05 20:51:01 +03:00
Anton Reutov
e3df1aaec7 Minor fix for stpl templates 2017-10-05 20:50:47 +03:00
Anton Reutov
70cd6932af Minor fix for stpl templates 2017-10-05 20:50:36 +03:00
Anton Reutov
4c9f9ace40 Minor fix for stpl templates 2017-10-05 20:50:21 +03:00
Anton Reutov
696f89f3ee Minor fix for stpl templates 2017-10-05 20:50:09 +03:00
Anton Reutov
33b662d8dc Minor fix for stpl templates 2017-10-05 20:49:58 +03:00
Anton Reutov
136a691cb1 Minor fix for stpl templates 2017-10-05 20:49:47 +03:00
Anton Reutov
0cb64bb0b4 Minor fix for stpl templates 2017-10-05 20:49:36 +03:00
Anton Reutov
086df6d8db Minor fix for stpl templates 2017-10-05 20:49:26 +03:00
Anton Reutov
fd216f458f Minor fix for stpl templates 2017-10-05 20:49:19 +03:00
Anton Reutov
25666df7d2 Minor fix for stpl templates 2017-10-05 20:48:56 +03:00
Anton Reutov
364789ee28 Minor fix for stpl templates 2017-10-05 20:48:38 +03:00
Anton Reutov
c19a6c26bc Minor fix for stpl templates 2017-10-05 20:48:31 +03:00
Anton Reutov
4fbdec51f1 Minor fix for stpl templates 2017-10-05 20:40:13 +03:00
Anton Reutov
9ed4fdbae5 Minor fix for stpl templates 2017-10-05 20:40:08 +03:00
Anton Reutov
c3ce563fbf Minor fix for stpl templates 2017-10-05 20:40:01 +03:00
Anton Reutov
98928f63d0 Minor fix for stpl templates 2017-10-05 20:39:59 +03:00
Anton Reutov
f9846009d5 Minor fix for stpl templates 2017-10-05 20:39:57 +03:00
Anton Reutov
bf04a7918d Minor fix for stpl templates 2017-10-05 20:39:55 +03:00
Anton Reutov
1c2728eb12 Minor fix for stpl templates 2017-10-05 20:38:39 +03:00
Anton Reutov
4c3af1b821 Minor fix for stpl templates 2017-10-05 20:38:36 +03:00
Anton Reutov
d91a9312af Minor fix for stpl templates 2017-10-05 20:38:33 +03:00
Anton Reutov
38e10d0dd9 Minor fix for stpl templates 2017-10-05 20:38:31 +03:00
Anton Reutov
2a09d9bef2 Minor fix for stpl templates 2017-10-05 20:37:38 +03:00
Anton Reutov
552a93fb54 Minor fix for stpl templates 2017-10-05 20:37:31 +03:00
Anton Reutov
9c48eeb029 Minor fix for stpl templates 2017-10-05 20:36:46 +03:00
Anton Reutov
1f6b87cd30 Minor fix for stpl templates 2017-10-05 20:36:16 +03:00
Anton Reutov
fb4e5fbcb3 Minor fix for stpl templates 2017-10-05 20:36:11 +03:00
Anton Reutov
e072c7cfbb Minor fix for stpl templates 2017-10-05 20:36:08 +03:00
Anton Reutov
40e42f73fa Minor fix for stpl templates 2017-10-05 20:36:05 +03:00
Anton Reutov
1ca7035c9d Minor fix for stpl templates 2017-10-05 20:35:56 +03:00
Anton Reutov
2f54f660fb Minor fix for stpl templates 2017-10-05 20:12:57 +03:00
Anton Reutov
d9755170a4 Minor fix for stpl templates 2017-10-05 20:12:55 +03:00
Anton Reutov
fb37869bfc Minor fix for stpl templates 2017-10-05 20:12:54 +03:00
Anton Reutov
44ea4924e3 Minor fix for stpl templates 2017-10-05 20:12:25 +03:00
Anton Reutov
b344d3c68e Minor fix for stpl templates 2017-10-05 20:12:22 +03:00
Anton Reutov
478744d372 Minor fix for stpl templates 2017-10-05 20:11:36 +03:00
Anton Reutov
18f57eff73 Minor fix for stpl templates 2017-10-05 20:11:32 +03:00
Anton Reutov
662c62805d Minor fix for stpl templates 2017-10-05 20:10:37 +03:00
Anton Reutov
ab16423771 Minor fix for stpl templates 2017-10-05 20:10:11 +03:00
Anton Reutov
7f0e9576d8 Minor fix for stpl templates 2017-10-05 20:10:08 +03:00
Anton Reutov
0137fd425e Minor fix for stpl templates 2017-10-05 20:10:05 +03:00
Anton Reutov
e021311f5f Minor fix for stpl templates 2017-10-05 20:09:07 +03:00
Anton Reutov
ead9b038c7 Minor fix for stpl templates 2017-10-05 20:09:01 +03:00
Anton Reutov
f4833f65b2 Minor fix for stpl templates 2017-10-05 20:08:56 +03:00
Anton Reutov
eefc81cb28 Minor fix for stpl templates 2017-10-05 20:07:45 +03:00
Anton Reutov
5c45c80402 Minor fix for stpl templates 2017-10-05 20:07:36 +03:00
Anton Reutov
9ce62fc4d9 Minor fix for stpl templates 2017-10-05 20:07:14 +03:00
Anton Reutov
797c59e7da Minor fix for stpl templates 2017-10-05 20:06:50 +03:00
Anton Reutov
0c7f1305d6 Minor fixes for caching.stpl template 2017-09-22 20:30:37 +03:00
Anton Reutov
ab57949a54 Minor fixes for caching.stpl template 2017-09-22 20:29:28 +03:00
Anton Reutov
1755b20efc Minor fixes for caching.stpl template 2017-09-22 19:27:56 +03:00
Anton Reutov
6c1deef717 Minor fixes for caching.stpl template 2017-09-22 19:26:28 +03:00
Anton Reutov
88c1192d59 Minor fixes for caching.stpl template 2017-09-22 18:30:18 +03:00
Anton Reutov
e05074fd8d Minor fixes for caching.stpl template 2017-09-22 18:27:36 +03:00
Anton Reutov
66b7515822 Minor fixes for caching.stpl template 2017-09-22 18:26:18 +03:00
Anton Reutov
a7fd96342e Minor fixes for caching.stpl template 2017-09-22 18:22:00 +03:00
Anton Reutov
a81fce78e9 Minor fixes for caching.stpl template 2017-09-22 18:17:19 +03:00
Anton Reutov
a947dcb2b6 Update caching.stpl
Minor fixes for caching.stpl template
2017-09-22 18:14:52 +03:00
Anton Reutov
caddcb712a Update caching.stpl 2017-09-22 17:55:39 +03:00
Anton Reutov
417f983ff1 Update caching.stpl
Minor fixes for caching.stpl template
2017-09-22 17:50:40 +03:00
Anton Reutov
35572894d5 Update caching.stpl
Minor fixes for caching.stpl template
2017-09-22 17:46:49 +03:00
Anton Reutov
a9213cd98c Update caching.stpl
Minor fixes for caching.stpl template
2017-09-22 16:44:13 +03:00
Anton Reutov
5f43f51073 Update caching.stpl
Minor fixes for caching,stpl template
2017-09-22 15:41:08 +03:00
Anton Reutov
2f7c1ffc90 Update caching.stpl
Minor fixes for caching.stpl template
2017-09-22 15:39:57 +03:00
Ekrem KAYA
6deeac85a2 Warning: autocreate plugin is deprecated, use mailbox { auto } setting instead 2017-09-20 19:13:16 +03:00
Marcos
7ea127f016 Fix suspend mail account quota 2017-09-19 12:46:34 +02:00
Marcos
7ab3fef273 Improved DNS zone 2017-09-18 12:06:02 +02:00
Anton Reutov
79c3260cec Merge pull request #1276 from gdevdeiv/master
Added Magento web template (latest version, 2.1).
2017-09-16 21:18:38 +03:00
Anton Reutov
dd5ba849e4 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:10:14 +03:00
Anton Reutov
fef5e9c594 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:09:20 +03:00
Anton Reutov
ada7769d1b Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:08:41 +03:00
Anton Reutov
19cf2ddaba Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:07:58 +03:00
Anton Reutov
8913424331 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:06:58 +03:00
Anton Reutov
da5f720f56 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:06:08 +03:00
Anton Reutov
36b9d2ba22 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:03:16 +03:00
Anton Reutov
345bdb44da Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:02:23 +03:00
Anton Reutov
4de5dc0b0b Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:01:23 +03:00
Anton Reutov
133b1a76c5 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 21:00:12 +03:00
Anton Reutov
3d2231ba56 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 20:59:01 +03:00
Anton Reutov
c50adb3f95 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 20:58:06 +03:00
Anton Reutov
8d6ae9d4a1 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 20:57:04 +03:00
Anton Reutov
fabd6f1099 Update magento.stpl
Fix docroot to sdocroot
2017-09-16 20:52:10 +03:00
Anton Reutov
d72d85d66f Update magento.stpl
Fix docroot to sdocroot
2017-09-16 20:49:24 +03:00
Anton Reutov
0724f4c35b Update wordpress2.stpl 2017-09-15 18:50:46 +03:00
Anton Reutov
065b9053ba Update wordpress.stpl 2017-09-15 18:50:26 +03:00
Anton Reutov
a6bd5389fc Update pyrocms.stpl 2017-09-15 18:50:13 +03:00
Anton Reutov
0fa8718c75 Update piwik.stpl 2017-09-15 18:49:41 +03:00
Anton Reutov
adc57e0d76 Update owncloud.stpl 2017-09-15 18:49:31 +03:00
Anton Reutov
f5737ed501 Update moodle.stpl 2017-09-15 18:49:25 +03:00
Anton Reutov
574e54ac09 Update modx.stpl 2017-09-15 18:49:03 +03:00
Anton Reutov
34ee676a3a Update joomla.stpl 2017-09-15 18:48:34 +03:00
Anton Reutov
c0ebc0ccf3 Update drupal8.stpl 2017-09-15 18:48:26 +03:00
Anton Reutov
149e41d6f7 Update drupal7.stpl 2017-09-15 18:48:20 +03:00
Anton Reutov
762965c16e Update drupal6.stpl 2017-09-15 18:46:41 +03:00
Anton Reutov
6e86dc252f Update dokuwiki.stpl 2017-09-15 18:46:37 +03:00
Anton Reutov
506b42d511 Update datalife_engine.stpl 2017-09-15 18:46:33 +03:00
Anton Reutov
f6e176443b Update codeigniter3.stpl 2017-09-15 18:45:55 +03:00
Anton Reutov
c01138d10d Update codeigniter2.stpl 2017-09-15 18:45:50 +03:00
Anton Reutov
a68dd659eb Update cms_made_simple.stpl 2017-09-15 18:45:44 +03:00
Anton Reutov
8a45b4b266 Update wordpress2.stpl 2017-09-15 18:36:11 +03:00
Anton Reutov
3ef92adbbd Update wordpress.stpl 2017-09-15 18:35:58 +03:00
Anton Reutov
3cb6ef3f0b Update pyrocms.stpl 2017-09-15 18:35:51 +03:00
Anton Reutov
eb8470f739 Update piwik.stpl 2017-09-15 18:35:37 +03:00
Anton Reutov
8eb5b2a5c3 Update owncloud.stpl 2017-09-15 18:35:23 +03:00
Anton Reutov
0130a912fa Update drupal8.stpl 2017-09-15 18:34:01 +03:00
Anton Reutov
f84aef5d08 Update drupal7.stpl 2017-09-15 18:33:40 +03:00
Anton Reutov
eb6add8139 Update drupal6.stpl 2017-09-15 18:33:21 +03:00
Anton Reutov
bde6a454d8 Update dokuwiki.stpl 2017-09-15 18:33:06 +03:00
Anton Reutov
9cc44c7e53 Update datalife_engine.stpl 2017-09-15 18:32:40 +03:00
Anton Reutov
615f4c188c Update codeigniter3.stpl 2017-09-15 18:32:19 +03:00
Anton Reutov
3d8ab2c337 Update codeigniter2.stpl 2017-09-15 18:32:00 +03:00
Anton Reutov
350c1c9cfb Update cms_made_simple.stpl 2017-09-15 18:31:41 +03:00
Anton Reutov
5d347964b4 Update moodle.stpl 2017-09-15 18:30:40 +03:00
Anton Reutov
568db3ac56 Update modx.stpl 2017-09-15 18:30:33 +03:00
Anton Reutov
20e240bc46 Update joomla.stpl 2017-09-15 18:30:27 +03:00
Anton Reutov
b30f0c65d7 Update wordpress2.stpl 2017-09-15 18:21:32 +03:00
Anton Reutov
dd254319be Update wordpress.stpl 2017-09-15 18:21:25 +03:00
Anton Reutov
11785833bb Update pyrocms.stpl 2017-09-15 18:21:18 +03:00
Anton Reutov
ccb3432244 Update piwik.stpl 2017-09-15 18:18:56 +03:00
Anton Reutov
86a71659e2 Update owncloud.stpl 2017-09-15 18:18:48 +03:00
Anton Reutov
5b83b3b0f4 Update moodle.stpl 2017-09-15 18:18:41 +03:00
Anton Reutov
8054d8d3f6 Update modx.stpl 2017-09-15 18:17:40 +03:00
Anton Reutov
94a660b64b Update joomla.stpl 2017-09-15 18:17:31 +03:00
Anton Reutov
4c47e972be Update drupal8.stpl 2017-09-15 18:17:25 +03:00
Anton Reutov
1884955b9f Update drupal6.stpl 2017-09-15 18:14:59 +03:00
Anton Reutov
1817b8c8b7 Update dokuwiki.stpl 2017-09-15 18:14:51 +03:00
Anton Reutov
c6696898c8 Update datalife_engine.stpl 2017-09-15 18:14:45 +03:00
Anton Reutov
de45d52712 Update codeigniter3.stpl 2017-09-15 18:12:49 +03:00
Anton Reutov
8f841bb6df Update codeigniter2.stpl 2017-09-15 18:12:44 +03:00
Anton Reutov
2d333214bb Update cms_made_simple.stpl 2017-09-15 18:12:41 +03:00
Anton Reutov
b4925a74af Update wordpress2.stpl 2017-09-15 18:05:50 +03:00
Anton Reutov
b4833af5b0 Update wordpress.stpl 2017-09-15 18:05:43 +03:00
Anton Reutov
210271dcdf Update pyrocms.stpl 2017-09-15 18:05:40 +03:00
Anton Reutov
66f0c6d388 Update piwik.stpl 2017-09-15 18:05:37 +03:00
Anton Reutov
2f77b35663 Update owncloud.stpl 2017-09-15 18:04:47 +03:00
Anton Reutov
7c7b900131 Update moodle.stpl 2017-09-15 18:04:42 +03:00
Anton Reutov
f12df4d2f6 Update modx.stpl 2017-09-15 18:04:31 +03:00
Anton Reutov
77f4f125a8 Update joomla.stpl 2017-09-15 18:04:00 +03:00
Anton Reutov
a501456fb1 Update drupal8.stpl 2017-09-15 18:03:55 +03:00
Anton Reutov
cfb2b083d9 Update drupal7.stpl 2017-09-15 18:03:51 +03:00
Anton Reutov
b95e6364a7 Update drupal6.stpl 2017-09-15 18:03:28 +03:00
Anton Reutov
a5e90a3e47 Update dokuwiki.stpl 2017-09-15 18:03:13 +03:00
Anton Reutov
31f55e1ac5 Update datalife_engine.stpl 2017-09-15 18:02:44 +03:00
Anton Reutov
290cd430ad Update codeigniter3.stpl 2017-09-15 18:02:36 +03:00
Anton Reutov
0e5c971f26 Update codeigniter2.stpl 2017-09-15 17:57:56 +03:00
Anton Reutov
1e5fa6d767 Update cms_made_simple.stpl 2017-09-15 17:57:47 +03:00
Anton Reutov
35757f2fc6 Update wordpress2.stpl 2017-09-15 17:25:10 +03:00
Anton Reutov
5cae2d7ae3 Update wordpress2.stpl 2017-09-15 17:24:58 +03:00
Anton Reutov
c83cba634a Update piwik.stpl 2017-09-15 17:22:36 +03:00
Anton Reutov
49b1aaa455 Update pyrocms.stpl 2017-09-15 17:22:31 +03:00
Anton Reutov
8e18313104 Update wordpress.stpl 2017-09-15 17:22:28 +03:00
Anton Reutov
92b90de5d2 Update wordpress2.stpl 2017-09-15 17:22:24 +03:00
Anton Reutov
52fea5c435 Update owncloud.stpl 2017-09-15 17:21:34 +03:00
Anton Reutov
7c03a82506 Update moodle.stpl 2017-09-15 17:21:27 +03:00
Anton Reutov
9d73486ab9 Update modx.stpl 2017-09-15 17:21:22 +03:00
Anton Reutov
8aee447477 Update joomla.stpl 2017-09-15 17:20:19 +03:00
Anton Reutov
e16bef6dfe Update drupal8.stpl 2017-09-15 17:20:16 +03:00
Anton Reutov
b53d703b95 Update drupal7.stpl 2017-09-15 17:20:13 +03:00
Anton Reutov
0be57f2b30 Update drupal6.stpl 2017-09-15 17:17:20 +03:00
Anton Reutov
5b4c3c56e0 Update dokuwiki.stpl 2017-09-15 17:17:14 +03:00
Anton Reutov
565a4460cd Update datalife_engine.stpl 2017-09-15 17:17:07 +03:00
Anton Reutov
57c05a4be0 Update codeigniter3.stpl 2017-09-15 17:15:51 +03:00
Anton Reutov
e98e52231e Update codeigniter2.stpl 2017-09-15 17:15:41 +03:00
Anton Reutov
d2a6edc5fa Update cms_made_simple.stpl 2017-09-15 17:15:32 +03:00
Anton Reutov
4a30dc41b2 Update wordpress2.stpl 2017-09-15 17:06:19 +03:00
Anton Reutov
0fa48b90ee Update wordpress.stpl 2017-09-15 17:06:12 +03:00
Anton Reutov
8bb4f52295 Update pyrocms.stpl 2017-09-15 17:06:04 +03:00
Anton Reutov
f9e3a6be5c Update piwik.stpl 2017-09-15 17:05:35 +03:00
Anton Reutov
3b7ea00218 Update owncloud.stpl 2017-09-15 17:05:25 +03:00
Anton Reutov
fa366e9858 Update moodle.stpl 2017-09-15 17:05:17 +03:00
Anton Reutov
e3f3a48db3 Update modx.stpl 2017-09-15 17:04:58 +03:00
Anton Reutov
26ade6169a Update joomla.stpl 2017-09-15 17:04:49 +03:00
Anton Reutov
7550ac5561 Update drupal8.stpl 2017-09-15 17:04:13 +03:00
Anton Reutov
01cf1f793a Update drupal7.stpl 2017-09-15 17:04:04 +03:00
Anton Reutov
3e85894295 Update drupal6.stpl 2017-09-15 17:03:56 +03:00
Anton Reutov
c7e075fdd1 Update dokuwiki.stpl 2017-09-15 17:02:49 +03:00
Anton Reutov
f7e81c118d Update datalife_engine.stpl 2017-09-15 17:02:29 +03:00
Anton Reutov
c9cb7ae997 Update codeigniter3.stpl 2017-09-15 17:02:09 +03:00
Anton Reutov
31ae6133b0 Update codeigniter2.stpl 2017-09-15 17:01:59 +03:00
Anton Reutov
a0b5e5578a Update cms_made_simple.stpl 2017-09-15 17:01:44 +03:00
Anton Reutov
21df33ccfe Update wordpress2.stpl 2017-09-15 16:42:36 +03:00
Anton Reutov
7d16cc2d92 Update wordpress.stpl 2017-09-15 16:42:31 +03:00
Anton Reutov
8648bcfe18 Update pyrocms.stpl 2017-09-15 16:42:28 +03:00
Anton Reutov
6bbf3560b7 Update piwik.stpl 2017-09-15 16:42:20 +03:00
Anton Reutov
5e1affd38c Update owncloud.stpl 2017-09-15 16:41:44 +03:00
Anton Reutov
68b40ae722 Update moodle.stpl 2017-09-15 16:41:38 +03:00
Anton Reutov
4d51d52405 Update modx.stpl 2017-09-15 16:41:33 +03:00
Anton Reutov
fca902768e Update joomla.stpl 2017-09-15 16:40:52 +03:00
Anton Reutov
37e86bf392 Update drupal8.stpl 2017-09-15 16:40:46 +03:00
Anton Reutov
6e2e787063 Update drupal7.stpl 2017-09-15 16:40:42 +03:00
Anton Reutov
9e84670bdc Update drupal6.stpl 2017-09-15 16:40:16 +03:00
Anton Reutov
8d237fa437 Update dokuwiki.stpl 2017-09-15 16:40:10 +03:00
Anton Reutov
7fcb88654f Update datalife_engine.stpl 2017-09-15 16:39:56 +03:00
Anton Reutov
95bc2a64a9 Update codeigniter3.stpl 2017-09-15 16:31:15 +03:00
Anton Reutov
d82ecfde41 Update codeigniter2.stpl 2017-09-15 16:31:08 +03:00
Anton Reutov
f5e6614f38 Update cms_made_simple.stpl 2017-09-15 16:30:37 +03:00
Anton Reutov
80edce7f03 Update wordpress2.stpl 2017-09-15 16:15:27 +03:00
Anton Reutov
ca90a3d7f8 Update wordpress.stpl 2017-09-15 16:15:22 +03:00
Anton Reutov
730eff38d2 Update pyrocms.stpl 2017-09-15 16:15:09 +03:00
Anton Reutov
2ef0624ffc Update piwik.stpl 2017-09-15 16:15:05 +03:00
Anton Reutov
d639db7926 Update owncloud.stpl 2017-09-15 16:14:43 +03:00
Anton Reutov
af93fa577f Update moodle.stpl 2017-09-15 16:14:23 +03:00
Anton Reutov
c1f14be7db Update modx.stpl 2017-09-15 16:13:40 +03:00
Anton Reutov
ac32de9db1 Update joomla.stpl 2017-09-15 16:13:30 +03:00
Anton Reutov
1c4d4e81bf Update drupal8.stpl 2017-09-15 16:13:25 +03:00
Anton Reutov
35c83b430d Update drupal7.stpl 2017-09-15 16:13:09 +03:00
Anton Reutov
9a3b9f0e1c Update drupal6.stpl 2017-09-15 16:13:05 +03:00
Anton Reutov
a8c7f11525 Update dokuwiki.stpl 2017-09-15 16:13:01 +03:00
Anton Reutov
f75d026a93 Update datalife_engine.stpl 2017-09-15 16:12:45 +03:00
Anton Reutov
d6626b9071 Update codeigniter3.stpl 2017-09-15 16:12:41 +03:00
Anton Reutov
3bbcd800e9 Update codeigniter2.stpl 2017-09-15 16:12:25 +03:00
Anton Reutov
7b20cf1959 Update cms_made_simple.stpl 2017-09-15 16:12:20 +03:00
Anton Reutov
045c35ba1f Update wordpress2.stpl 2017-09-15 16:03:37 +03:00
Anton Reutov
b22e85f81e Update wordpress.stpl 2017-09-15 16:03:33 +03:00
Anton Reutov
06b790292e Update pyrocms.stpl 2017-09-15 16:03:17 +03:00
Anton Reutov
37b85a6e3b Update piwik.stpl 2017-09-15 16:03:11 +03:00
Anton Reutov
ab91b0e82a Update owncloud.stpl 2017-09-15 16:02:53 +03:00
Anton Reutov
160d7080a7 Update moodle.stpl 2017-09-15 16:02:49 +03:00
Anton Reutov
47c239a960 Update modx.stpl 2017-09-15 16:02:25 +03:00
Anton Reutov
0896173ec3 Update joomla.stpl 2017-09-15 16:02:15 +03:00
Anton Reutov
599e9eaf0b Update drupal8.stpl 2017-09-15 16:02:10 +03:00
Anton Reutov
c17698f670 Update drupal7.stpl 2017-09-15 16:02:06 +03:00
Anton Reutov
e216963988 Update drupal6.stpl 2017-09-15 16:02:01 +03:00
Anton Reutov
de08af7537 Update dokuwiki.stpl 2017-09-15 16:01:25 +03:00
Anton Reutov
b0e6f32be4 Update datalife_engine.stpl 2017-09-15 16:01:17 +03:00
Anton Reutov
49ae3a693c Update codeigniter3.stpl 2017-09-15 16:01:12 +03:00
Anton Reutov
43d77fa6ed Update codeigniter2.stpl 2017-09-15 16:01:06 +03:00
Anton Reutov
c7cf3997bb Update cms_made_simple.stpl 2017-09-15 16:01:02 +03:00
Anton Reutov
db4428e43b Update wordpress2.stpl 2017-09-15 15:55:33 +03:00
Anton Reutov
8b2147631d Update wordpress2.stpl 2017-09-15 15:55:24 +03:00
Anton Reutov
68e2ea0f5e Update cms_made_simple.stpl 2017-09-15 15:54:05 +03:00
Anton Reutov
788beb05cf Update wordpress2.stpl 2017-09-15 15:53:50 +03:00
Anton Reutov
14726dc48e Update wordpress.stpl 2017-09-15 15:53:46 +03:00
Anton Reutov
805c7c92bb Update pyrocms.stpl 2017-09-15 15:52:16 +03:00
Anton Reutov
29c661f75f Update piwik.stpl 2017-09-15 15:52:14 +03:00
Anton Reutov
c58b3e873f Update owncloud.stpl 2017-09-15 15:51:54 +03:00
Anton Reutov
22a166f584 Update moodle.stpl 2017-09-15 15:51:50 +03:00
Anton Reutov
2c43867999 Update modx.stpl 2017-09-15 15:51:47 +03:00
Anton Reutov
5822d5d4cc Update joomla.stpl 2017-09-15 15:51:32 +03:00
Anton Reutov
d3ec05127c Update drupal8.stpl 2017-09-15 15:51:29 +03:00
Anton Reutov
44656266af Update drupal7.stpl 2017-09-15 15:51:25 +03:00
Anton Reutov
f86d6f5dfb Update drupal6.stpl 2017-09-15 15:51:07 +03:00
Anton Reutov
9fc4f635af Update dokuwiki.stpl 2017-09-15 15:51:01 +03:00
Anton Reutov
033315b9cb Update datalife_engine.stpl 2017-09-15 15:50:52 +03:00
Anton Reutov
f127c402b1 Update codeigniter3.stpl 2017-09-15 15:50:39 +03:00
Anton Reutov
b791bb3051 Update codeigniter2.stpl 2017-09-15 15:50:29 +03:00
Anton Reutov
cd62426b00 Update wordpress2.stpl 2017-09-15 15:14:34 +03:00
Anton Reutov
9df8db3baa Update wordpress.stpl 2017-09-15 15:14:26 +03:00
Anton Reutov
615f1668ca Update pyrocms.stpl 2017-09-15 15:13:55 +03:00
Anton Reutov
2bb67e09a8 Update piwik.stpl 2017-09-15 15:13:51 +03:00
Anton Reutov
cf51d5cb75 Update owncloud.stpl 2017-09-15 15:13:48 +03:00
Anton Reutov
30fc2a81db Update moodle.stpl 2017-09-15 15:13:11 +03:00
Anton Reutov
d0e6b571f2 Update modx.stpl 2017-09-15 15:13:04 +03:00
Anton Reutov
395a291024 Update joomla.stpl 2017-09-15 15:12:22 +03:00
Anton Reutov
80780e925e Update drupal8.stpl 2017-09-15 15:10:55 +03:00
Anton Reutov
7d58771537 Update drupal7.stpl 2017-09-15 15:10:45 +03:00
Anton Reutov
2b4c5a1ff3 Update drupal6.stpl 2017-09-15 15:10:41 +03:00
Anton Reutov
18c0e9ee7e Update dokuwiki.stpl 2017-09-15 15:09:43 +03:00
Anton Reutov
5c4be6d655 Update datalife_engine.stpl 2017-09-15 15:09:20 +03:00
Anton Reutov
9869aab177 Update codeigniter2.stpl 2017-09-15 15:09:10 +03:00
Anton Reutov
178f495819 Update wordpress2.stpl 2017-09-15 15:03:39 +03:00
Anton Reutov
f56bdc5854 Update wordpress.stpl 2017-09-15 15:03:32 +03:00
Anton Reutov
cc4cffbe82 Update pyrocms.stpl 2017-09-15 15:03:27 +03:00
Anton Reutov
63ed958c93 Update piwik.stpl 2017-09-15 15:03:17 +03:00
Anton Reutov
74a57d5c8c Update owncloud.stpl 2017-09-15 15:03:11 +03:00
Anton Reutov
f8df0a5ce2 Update moodle.stpl 2017-09-15 15:03:06 +03:00
Anton Reutov
dacb9c6c82 Update modx.stpl 2017-09-15 15:02:59 +03:00
Anton Reutov
9c1b914177 Update joomla.stpl 2017-09-15 15:02:47 +03:00
Anton Reutov
10e6ab1a3b Update drupal8.stpl 2017-09-15 15:02:39 +03:00
Anton Reutov
b0a3b46361 Update drupal7.stpl 2017-09-15 15:02:31 +03:00
Anton Reutov
d7452a46ed Update drupal6.stpl 2017-09-15 15:02:27 +03:00
Anton Reutov
366becacd6 Update dokuwiki.stpl 2017-09-15 15:02:24 +03:00
Anton Reutov
07392f6bba Update datalife_engine.stpl 2017-09-15 15:02:19 +03:00
Anton Reutov
cfb98568f2 Update codeigniter3.stpl 2017-09-15 15:02:15 +03:00
Anton Reutov
a5c5d30fc8 Update codeigniter2.stpl 2017-09-15 15:02:09 +03:00
Anton Reutov
e1f21a24ed Update cms_made_simple.stpl 2017-09-15 15:02:05 +03:00
Anton Reutov
f99e0b2894 Update wordpress2.stpl 2017-09-15 14:54:55 +03:00
Anton Reutov
2b796ef911 Update wordpress.stpl 2017-09-15 14:54:50 +03:00
Anton Reutov
1d2e9667ff Update pyrocms.stpl 2017-09-15 14:54:46 +03:00
Anton Reutov
7c49c57afb Update piwik.stpl 2017-09-15 14:54:33 +03:00
Anton Reutov
75c2848008 Update owncloud.stpl 2017-09-15 14:54:29 +03:00
Anton Reutov
d05d92be36 Update moodle.stpl 2017-09-15 14:54:09 +03:00
Anton Reutov
38a132ff01 Update modx.stpl 2017-09-15 14:54:01 +03:00
Anton Reutov
a86b83e43d Update joomla.stpl 2017-09-15 14:53:54 +03:00
Anton Reutov
9343acbaed Update drupal8.stpl 2017-09-15 14:53:32 +03:00
Anton Reutov
ec40e373c7 Update drupal7.stpl 2017-09-15 14:53:28 +03:00
Anton Reutov
03efba6f35 Update drupal6.stpl 2017-09-15 14:53:21 +03:00
Anton Reutov
4d2e658c6d Update dokuwiki.stpl 2017-09-15 14:53:09 +03:00
Anton Reutov
3114e34368 Update datalife_engine.stpl 2017-09-15 14:51:42 +03:00
Anton Reutov
0bc2e06fb5 Update codeigniter3.stpl 2017-09-15 14:51:38 +03:00
Anton Reutov
67b58bf830 Update codeigniter2.stpl 2017-09-15 14:51:34 +03:00
Anton Reutov
e3a1c3cb54 Update cms_made_simple.stpl 2017-09-15 14:51:26 +03:00
Anton Reutov
801fd75e2c Update wordpress2.stpl 2017-09-15 14:44:46 +03:00
Anton Reutov
091f34038a Update wordpress.stpl 2017-09-15 14:44:40 +03:00
Anton Reutov
077273fc80 Update pyrocms.stpl 2017-09-15 14:44:20 +03:00
Anton Reutov
bf01d4890d Update piwik.stpl 2017-09-15 14:44:14 +03:00
Anton Reutov
5b1d185b8b Update owncloud.stpl 2017-09-15 14:44:10 +03:00
Anton Reutov
c806e4dd97 Update moodle.stpl 2017-09-15 14:43:51 +03:00
Anton Reutov
36f3d92198 Update modx.stpl 2017-09-15 14:43:46 +03:00
Anton Reutov
257c08c25e Update joomla.stpl 2017-09-15 14:43:41 +03:00
Anton Reutov
ab5f357e26 Update drupal8.stpl 2017-09-15 14:43:28 +03:00
Anton Reutov
f84725ee10 Update drupal7.stpl 2017-09-15 14:43:16 +03:00
Anton Reutov
15857f0118 Update drupal6.stpl 2017-09-15 14:43:09 +03:00
Anton Reutov
95132e6b77 Update dokuwiki.stpl 2017-09-15 14:43:00 +03:00
Anton Reutov
4b36618e98 Update datalife_engine.stpl 2017-09-15 14:42:37 +03:00
Anton Reutov
4f53e1d9f8 Update codeigniter3.stpl 2017-09-15 14:42:29 +03:00
Anton Reutov
b5141a62f0 Update codeigniter2.stpl 2017-09-15 14:42:12 +03:00
Anton Reutov
140f7f0285 Update cms_made_simple.stpl 2017-09-15 14:42:08 +03:00
Anton Reutov
0893f511bd Update wordpress2.stpl 2017-09-15 14:36:10 +03:00
Anton Reutov
1acfb3ec9e Update wordpress.stpl 2017-09-15 14:35:59 +03:00
Anton Reutov
97022c6766 Update pyrocms.stpl 2017-09-15 14:35:46 +03:00
Anton Reutov
57f3e84ef6 Update piwik.stpl 2017-09-15 14:35:34 +03:00
Anton Reutov
2e2f552aa8 Update owncloud.stpl 2017-09-15 14:35:21 +03:00
Anton Reutov
6fc0b7ee9e Update moodle.stpl 2017-09-15 14:35:07 +03:00
Anton Reutov
aec4aeeeda Update modx.stpl 2017-09-15 14:34:54 +03:00
Anton Reutov
678cc4694c Update joomla.stpl 2017-09-15 14:34:40 +03:00
Anton Reutov
650002876c Update drupal8.stpl 2017-09-15 14:34:26 +03:00
Anton Reutov
19fab6463f Update drupal7.stpl 2017-09-15 14:34:16 +03:00
Anton Reutov
4cd21d92be Update drupal6.stpl 2017-09-15 14:34:05 +03:00
Anton Reutov
a91f569765 Update dokuwiki.stpl 2017-09-15 14:33:53 +03:00
Anton Reutov
dcea9a5b6f Update datalife_engine.stpl 2017-09-15 14:33:42 +03:00
Anton Reutov
5cb745ac34 Update codeigniter3.stpl 2017-09-15 14:33:31 +03:00
Anton Reutov
789fba6585 Update codeigniter2.stpl 2017-09-15 14:30:40 +03:00
Anton Reutov
e4802fe136 Update cms_made_simple.stpl 2017-09-15 14:29:58 +03:00
Anton Reutov
534fe622bb Update codeigniter3.stpl 2017-09-15 14:26:55 +03:00
Anton Reutov
9223e957bf Update cms_made_simple.stpl 2017-09-15 14:26:34 +03:00
Anton Reutov
02bba8dc4d Update laravel.stpl 2017-09-15 13:58:13 +03:00
Anton Reutov
710873bc1e Update laravel.stpl 2017-09-15 13:57:39 +03:00
Anton Reutov
768d5b3cbe Update laravel.stpl 2017-09-15 13:56:54 +03:00
Anton Reutov
a7c6ba799b Update laravel.stpl 2017-09-15 13:56:21 +03:00
Anton Reutov
6e0675fcc6 Update laravel.stpl 2017-09-15 13:55:29 +03:00
Anton Reutov
4fcc667ac9 Update laravel.stpl 2017-09-15 13:54:35 +03:00
Anton Reutov
76c83d4438 Update laravel.stpl 2017-09-15 13:53:49 +03:00
Anton Reutov
612fc103dd Update laravel.stpl 2017-09-15 13:52:43 +03:00
Anton Reutov
965691199f Update laravel.stpl 2017-09-15 13:51:54 +03:00
Anton Reutov
2259568124 Update laravel.stpl 2017-09-15 13:51:13 +03:00
Anton Reutov
80ea4b7bc6 Update laravel.stpl 2017-09-15 13:50:21 +03:00
Anton Reutov
591d91244a Update laravel.stpl 2017-09-15 13:49:31 +03:00
Anton Reutov
cabf0f5ff3 Update laravel.stpl 2017-09-15 13:48:28 +03:00
Anton Reutov
3e37ced978 Update laravel.tpl 2017-09-15 13:48:00 +03:00
Anton Reutov
05d598dfc2 Update laravel.tpl 2017-09-15 13:46:05 +03:00
Anton Reutov
f4925227a0 Update laravel.stpl 2017-09-15 13:45:12 +03:00
Anton Reutov
dac79fc691 Update laravel.stpl 2017-09-15 13:43:12 +03:00
David Juan Ahullana
325595a2f3 Added Magento web template (latest version, 2.1). 2017-09-14 12:49:05 +02:00
Anton Reutov
926f68d18f Merge pull request #1196 from somthanat/master
fix web_port->web_ssl_port
2017-09-13 20:18:20 +03:00
Alexandr Loskutov
e93ef9389f Add .DS_Store to ignore patterns 2017-09-13 19:05:12 +03:00
Serge Kraev
95a26fb323 Merge branch 'master' into master 2017-09-13 17:05:31 +03:00
dpeca
5a83827c5e Merge pull request #1275 from serghey-rodin/madeITBelgium-patch-3
#1240 web/add/db/index.php double footer
2017-09-12 15:14:25 +02:00
Made I.T
8677627ef3 #1240 web/add/db/index.php double footer
Include of footer.html is already in render_page function.
2017-09-12 14:30:01 +02:00
Made I.T
1911cd2f0b Merge pull request #1265 from thvranken/master
Fixed typo in error message
2017-09-11 15:45:39 +02:00
dpeca
1a0ed0a893 Merge pull request #1272 from Hoto-Cocoa/master
Korean Translation
2017-09-10 16:11:45 +02:00
Hoto Cocoa
3901abf9b6 Miss! 2017-09-10 15:08:58 +09:00
Hoto Cocoa
b6c650dcd6 Finish 2017-09-10 10:05:35 +09:00
Hoto Cocoa
1578f0f26d Some korean 2017-09-08 19:53:12 +09:00
Hoto Cocoa
149e107635 Some translations 2017-09-08 18:53:23 +09:00
dpeca
ab17ffe7f8 Merge pull request #1262 from moucho/master
DNS template gmail.tpl with updated MX and SPF
2017-09-04 17:16:52 +02:00
G.Azamat
4868823057 fix db.sh for postgres 9.5+
fixed backup function for postgres 9.5+ (removed "-i" option)
2017-08-30 22:01:38 +05:00
Thomas Vranken
6329b7df21 Fixed typo in error message 2017-08-25 00:05:00 +02:00
Marcos
5fbc9510f4 DNS template gmail.tpl updated 2017-08-18 19:32:11 +02:00
Goh'Dan
fbfbda139a Add symlink support to find (pool can be symlinked, i. e. when using optional version of php) 2017-08-15 21:17:30 +03:00
cmstew
3fe9997ab3 Update v-sync-dns-cluster
Forgot to exclude the dns-cluster user in the updated script.
2017-08-10 11:44:38 -06:00
cmstew
a2e57fd199 Update v-sync-dns-cluster
Improved the script that gets the list of users. It now ignores any files that are in the $VESTA/data/users directory and only acknowledges folders.
2017-08-10 11:43:04 -06:00
ClayRabbit
e1d64b8730 On-the-fly gzip compression
Reduces backup time, free space requirement and disk writes.
2017-08-04 17:46:40 +05:00
Serghey Rodin
c8e03744ab remove chrooted bind package 2017-08-03 17:49:46 +03:00
Ilya Shipitsin
6cd03c1512 CentOS 7: increase number of open files
there's per package limitation of 100 web sites. So, vesta should limit
number of sites anyway. However, if one would want to have, for example,
350 web sites, he will be limited by OS settings.

so, lets remove limitation on the OS level and let vesta control things
2017-07-30 21:40:12 +05:00
Serghey Rodin
940421f467 increased memory limit up to 64mb for softaculous 2017-07-27 16:31:09 +03:00
dpeca
66614c5c11 Merge pull request #1246 from tdtgit/master
Enhance Vietnamese language pack
2017-07-27 14:19:08 +02:00
Anh Tuấn
aeb2925971 Add author credit 2017-07-27 19:09:40 +07:00
Anh Tuấn
c3438b286f Enhanced Vietnamese language pack 2017-07-27 19:07:24 +07:00
Anh Tuấn
5c8e19e776 Fix Vietnamese language pack 2017-07-27 18:56:40 +07:00
cmstew
0e8b482ae2 Minor bug fix of v-sync-dns-cluster
Problem Outlined: It seems that another script has dropped a file called history.log into the $VESTA/data/users folder causing v-sync-dns-cluster to throw a soft error about not finding /usr/local/vesta/data/users/history.log/dns.conf when syncing zones.

Fix: Tell the script to ignore that log file when syncing user domains and the output becomes clean.
2017-07-26 08:24:45 -06:00
szbnwer
70066f5988 double footer 2017-07-23 01:39:55 +02:00
cmstew
e71a1619f0 Update v-backup-user
I noticed that I always seemed to have 1 less backup than I was supposed to in my VestaCP. This fix resolves the issue for me.


Problem outlined:

- My VestaCP package says that I'm supposed to be allowed 3 backups.
- The backups tab of the GUI showed that I had 3 backups.
- I was never able to access the oldest backup (Almost like it wasn't actually there).
- I checked the backup folder using SSH and I found that I only ever have the latest 2 backups available.
- It was clear that a script was deleting the 3rd backup prematurely.
2017-07-21 10:58:21 -06:00
twoup
9947764365 Fix issue in v-letsencrypt-add-user
This issue is getting some hits on the forum. Tiny typo on Line 58.
exponent=$(openssl pkey -inform perm -in "$key" -noout -text_pub |\ 
-inform perm is not a valid openssl pkey option. The correct code iis:
exponent=$(openssl pkey -inform pem -in "$key" -noout -text_pub |\
2017-07-21 11:00:40 +01:00
dpeca
4e769aa83d Merge pull request #1234 from igge2015/master
Edit a few words For cn.php
2017-07-19 14:12:30 +02:00
igge2015
c18e8bacff Edit a few words 2017-07-19 19:11:05 +08:00
Serghey Rodin
3e6fd7e814 print domain name if attempt is unsuccessful 2017-07-18 16:51:30 +03:00
myrevery
0b59cadf11 Merge pull request #1 from myrevery/patch-1
Update cn.php
2017-07-16 15:59:18 -07:00
myrevery
05f15f1daf Update cn.php
Add Tips and refine some details.
2017-07-16 15:55:10 -07:00
szbnwer
8485dbdb31 fixed the name in logging 2017-07-07 18:33:23 +02:00
Serghey Rodin
b21624cddd --with-curl for vesta-php 2017-07-06 15:05:31 +03:00
dpeca
d446ba1e2b Avoid repeated and quoted additional FTP username in email
Avoid repeated and quoted additional FTP username in when changing FTP pass or path.
Before this fix email contains:
Username: test_'test_anna'
Now it is corrected to:
Username: test_anna
2017-06-29 11:40:21 +02:00
dpeca
116d8b2e87 Merge pull request #1220 from malsony/master
Update some wordings of cn.php (Chinese translations).
2017-06-28 18:13:17 +02:00
malsony
b3ca0785f4 Update some wordings of cn.php. 2017-06-28 23:33:12 +08:00
Serghey Rodin
2160b85d7a --with-mysql --with-mysqli 2017-06-26 23:31:50 +03:00
Serghey Rodin
a178727582 added --enable-mysqlnd --enable-mbstring 2017-06-23 14:05:27 +03:00
Serghey Rodin
597e5cb606 changed var names 2017-06-20 16:46:53 +03:00
Serghey Rodin
1c928dbcf8 changes update trigger to install trigger 2017-06-19 16:56:37 +03:00
Serghey Rodin
0cf3f4db7c ioncube trigger 2017-06-19 15:25:54 +03:00
Serghey Rodin
e6469d98c3 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-06-17 23:56:35 +03:00
Serghey Rodin
a3b53abe08 ioncube loader spec files 2017-06-17 23:55:50 +03:00
Naumov-Socolov Dmitry
a7eadc00f9 fixed cron validation 2017-06-16 13:40:43 +01:00
Serghey Rodin
0e9526e06e added --with-zlib 2017-06-15 16:01:17 +03:00
Serghey Rodin
0851623c80 version update 2017-06-14 16:13:29 +03:00
dpeca
cc6d9cc523 Merge pull request #1212 from FindYanot/patch-1
Fix var name
2017-06-13 15:45:56 +02:00
Artem Yanovsky
f29c34dee1 Fix var name
v_domain - not a constant
2017-06-13 15:34:02 +03:00
fliker09
9ab28c5782 Revert "Added installer for Amazon AMI"
This reverts commit cdd2bead79.

To be moved into another branch
2017-06-09 13:19:03 +03:00
Joubert RedRat
edcba71911
Fix on ssl home definition on Lets Encrypt cert renew 2017-06-06 01:22:38 -03:00
fliker09
cdd2bead79 Added installer for Amazon AMI 2017-06-05 16:52:45 +03:00
fliker09
d7496cf06f Small code and spellcheck fixes 2017-06-02 15:30:33 +03:00
Piotr Jasiek
95e71b0d16 Add to template wordpress2(s) rewrite for worpress
Without my changes i can use only http://example.com/?id=1 like on this site: http://napartments.pl/?page_id=162
after changes i can use http://example.com/post_name like on my site: https://s-m-s.pl/kontakt/. I want add new template because i thin rewrite is additional setting.
2017-05-21 01:21:07 +02:00
Piotr Jasiek
f30dab8c69 Add to template wordpress2 rewrite for worpress
Without my changes i can use only http://example.com/?id=1 like on this site: http://napartments.pl/?page_id=162
after changes i can use http://example.com/post_name like on my site: https://s-m-s.pl/kontakt/. I want add new template because i thin rewrite is additional setting.
2017-05-21 01:14:54 +02:00
dpeca
a07eb1da1b Merge pull request #1199 from Piotr-Pht-Jasiek, fix config pma tables
fix pma tables
2017-05-21 01:13:29 +02:00
Piotr Jasiek
7d43633906 fix pma tables
change prefix pma tables - pma_ to pma__. After install and first login to phpmyadmin i can't open any table. After change prefix in config it works. more info http://stackoverflow.com/a/20731569/7363457
2017-05-21 00:52:10 +02:00
dpeca
64e6fa8c9d Avoid too fast restarting of web server while renewing LetsEncrypt
Fix #1193
2017-05-15 13:47:30 +02:00
Somthanat Wongsa
a94dc67c2f fix web_port->web_ssl_port 2017-05-15 16:36:56 +07:00
Anton Reutov
798f8ca270 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-14 11:21:45 +02:00
Anton Reutov
6867ba6de4 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-14 11:20:37 +02:00
Anton Reutov
9c0fa6bdaf Fixing duplicate of lines in 01_caching_pool.conf 2017-05-14 10:11:29 +02:00
Anton Reutov
2eb8c6efe7 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:54:42 +02:00
Anton Reutov
fb48f16b0d Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:53:23 +02:00
Anton Reutov
6b7c085919 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:52:22 +02:00
Anton Reutov
d79eb4a331 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:51:12 +02:00
Anton Reutov
90222f875e Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:49:06 +02:00
Anton Reutov
3164532763 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:47:28 +02:00
Anton Reutov
cbed78e64d Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:45:54 +02:00
Anton Reutov
4c033a0a54 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 23:43:56 +02:00
Anton Reutov
c6694f2b41 Update caching.sh 2017-05-13 22:45:04 +02:00
Anton Reutov
d0e8707970 Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 22:43:56 +02:00
Anton Reutov
e856134c8e Fixing duplicate of lines in 01_caching_pool.conf 2017-05-13 21:41:34 +02:00
Anton Reutov
747be85de6 Merge pull request #1170 from demlasjr/patch-3
Fixing duplicate of lines in 01_caching_pool.conf
2017-05-13 00:27:07 +02:00
spfuture
9667e0b256 Update v-list-sys-services
correctly detect service name by '/' delimeter.
rev | cut -d'/' -f 1 | rev - get last field

This fix detect another path for php-fpm
ln -s /opt/remi/php70/root/usr/sbin/php-fpm /usr/sbin/php-fpm
2017-05-10 13:18:48 +03:00
darkworks
5c09ca3d8c Create ur.php
vesta translation to URDU language
2017-05-07 11:44:44 +05:00
darkworks
2658c03791 Delete ur.php 2017-05-07 11:37:31 +05:00
darkworks
b3846e85be Create ur.php 2017-05-06 21:56:10 +05:00
darkworks
edf38f16a2 Delete ur.php 2017-05-06 21:48:02 +05:00
darkworks
fe73aa0852 Update ur.php 2017-05-06 18:39:52 +05:00
darkworks
08ef43c801 Update ur.php 2017-05-06 18:37:00 +05:00
dpeca
b1e1635443 Cron format validation fix
-lt is 'lower than', so if you have wday=7 it will not be valid, which is wrong, because wday range is 0-7.
Changed to -le which means 'lower or equal'
2017-05-05 15:07:44 +02:00
dpeca
b57c4dcd7b Allow v-restore-user to restore backup from FTP and SFTP
Before this fix, sftpc() function had two 'else' blocks... so it was broken code... and script was unable to download file from SFTP
2017-05-04 19:11:34 +02:00
dpeca
4aeec46841 Making SFTP backup able to work with empty folder name 2017-04-28 20:37:20 +02:00
dpeca
92fa085755 Minor improvements for Serbian translation 2017-04-27 18:45:41 +02:00
Serghey Rodin
7ef52aa32c fix for system-base repos 2017-04-27 14:00:03 +03:00
dpeca
e861831bd5 Merge pull request #1184 from myrevery/patch-1
Update cn.php
2017-04-25 22:35:57 +02:00
myrevery
f1e3c7446e Merge pull request #3 from myrevery/patch-4
Update edit_server.html
2017-04-25 13:34:52 -07:00
myrevery
0cb3a6e0c8 Merge pull request #2 from myrevery/patch-3
Update edit_web.html
2017-04-25 13:34:06 -07:00
myrevery
08fa5998b5 Merge pull request #1 from myrevery/patch-2
Update edit_web.html
2017-04-25 13:33:24 -07:00
myrevery
be746109f7 Update edit_server.html
Add missing characters ":"
2017-04-25 13:23:56 -07:00
myrevery
6a975dcfa1 Update edit_web.html
Add missing characters ":"
2017-04-25 13:22:47 -07:00
myrevery
7c7483eb0e Update edit_web.html
Add missing characters ":"
2017-04-25 13:21:22 -07:00
myrevery
8d342eebe6 Update cn.php
Add some translation and refine some details.
2017-04-25 12:40:16 -07:00
dpeca
d02303f570 Merge pull request #1183 from Secretjail/patch-6
Update fa.php
2017-04-23 23:24:59 +02:00
Secretjail
16f54d0e7a Update fa.php
Update fa.php and correct some spelling.
2017-04-24 00:03:02 +04:30
dpeca
e022c6507b Better fix for FTP backup without folder name 2017-04-22 02:22:23 +02:00
dpeca
335b5fe41e Merge pull request #1179 from myrevery: Update cn.php
Update cn.php
2017-04-20 20:04:58 +02:00
myrevery
5e4ee8717e Update cn.php
Add some translation and refine some details.
Add feedback link.
2017-04-20 10:50:37 -07:00
dpeca
b8babfbe7a Minir improvements for Serbian translation 2017-04-19 21:22:50 +02:00
dpeca
7004ec0cb4 Reverting "Patch insecure CSRF token crypto vulnerability"
Reverting serghey-rodin/vesta#1164, because undefined function is used
2017-04-19 20:34:29 +02:00
dpeca
6938601440 Revert "Patch insecure CSRF token crypto vulnerability" 2017-04-19 20:32:22 +02:00
dpeca
367d0b34ef Making v-backup-user able to upload backup to FTP if FTP folder is not set
Before this fix v-backup-user was unable to upload backup to FTP if $BPATH (FTP folder) is not set
2017-04-19 15:36:43 +02:00
dpeca
0cbb3613df Merge pull request #1164 from Arinerron: Patch insecure CSRF token
Patch insecure CSRF token crypto vulnerability
2017-04-18 10:47:42 +02:00
dpeca
41c6dfcd1d Minor improvements for Serbian translation 2017-04-18 01:00:19 +02:00
dpeca
6dd37ccf00 Introducing Serbian translation 2017-04-17 20:59:45 +02:00
dpeca
43e03d1845 Translation improvements for Email Credentials 2017-04-14 15:40:38 +02:00
dpeca
9347c2aa04 Sending mail credentials to email [edit form] 2017-04-14 14:50:15 +02:00
dpeca
930a2a82e3 Making v-backup-user able to send email notification
doh...
2017-04-11 17:52:07 +02:00
demlasjr
835343c542 Fixing duplicate of lines in 01_caching_pool.conf 2017-04-09 23:12:05 +02:00
dpeca
2bff53e881 Minor fixes for Sending mail credentials to email 2017-04-09 02:54:35 +02:00
dpeca
8c1deb80f7 Sending mail credentials to email 2017-04-09 02:35:13 +02:00
dpeca
a68dce9bec Merge pull request #1165 from thatphon05/master: Thai language support
Thai language support
2017-04-07 14:35:56 +02:00
Thatphon05
7ba26ca455 Improve Thai translation 2017-04-07 16:12:23 +07:00
Thatphon05
c31ddeffe5 Improve Thai translation 2017-04-07 16:06:51 +07:00
Thatphon05
58eb46c9d9 Improve Thai translation 2017-04-07 10:39:52 +07:00
Thatphon05
8da708b4f7 add Thai Language 2017-04-06 19:33:13 +07:00
Thatphon05
6cd72e8911 add Thai Language 2017-04-06 19:31:58 +07:00
Arinerron
cb7168f536 Fix cryptographically insecure CSRF token bug 2017-04-05 16:18:44 -07:00
Arinerron
2f5c7a10b7 Fix cryptographically insecure CSRF tokens 2017-04-05 16:16:01 -07:00
Arinerron
2a27966a84 Merge pull request #2 from serghey-rodin/master
update fork
2017-04-05 16:10:05 -07:00
lapuh
6e79d17ec0 Update v-rebuild-web-domains 2017-03-28 14:25:03 +03:00
icez@icez.net
482298a71b [*]: fix open_basedir document root value for SSL-enabled site to correct document root 2017-03-18 23:58:58 +07:00
Robin Dirksen
4dbd58b579 Merge branch 'http2-support' of https://github.com/robindirksen1/vesta into http2-support 2017-03-18 06:27:41 +01:00
Robin Dirksen
eb7bdda8ad Create http2.stpl
Use http2 for faster loading, this requires https.

Create http2.tpl

No http2 support when HTTPS is not active...

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).

HTTP2 support

Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-18 06:27:19 +01:00
Serge Kraev
2a409e005b fix tmp dir for backup user 2017-03-17 19:15:13 +04:00
Serge Kraev
dc3807ceee fix tmp dir for restore user 2017-03-17 19:03:38 +04:00
Serge Kraev
a21824009f Merge pull request #1 from serghey-rodin/master
merge with master
2017-03-17 17:12:24 +04:00
dpeca
26f48c8172 Missing colon in edit_mail_acc.html template 2017-03-17 11:30:24 +01:00
dpeca
4276dd3519 Missing colon in add_mail_acc.html template 2017-03-17 11:27:12 +01:00
Made I.T
25e96c3216 Fix for Databases size not updated.
https://forum.vestacp.com/viewtopic.php?f=10&t=13526#p57651
2017-03-15 08:50:41 +01:00
dpeca
56cdadbe5c Making sure is always reseted in possible loops 2017-03-14 01:56:28 +01:00
dpeca
887ac8a11b Added missing domain_idn=$domain in v-restore-user 2017-03-14 01:08:20 +01:00
dpeca
a005c3e24a Added missing format_domain_idn in v-restore-user 2017-03-13 03:14:50 +01:00
dpeca
19e49efac1 Debian installer: roundcube config.inc.php 2017-03-08 16:01:11 +01:00
dpeca
e4beab4df3 Debian installer: changed 'unrar' package to 'unrar-free' 2017-03-06 13:47:09 +01:00
dpeca
5965b5a88e Accidentally deleted 'i' letter 2017-03-06 00:04:30 +01:00
dpeca
6d88ca31c3 Making sure domain_idn is always set 2017-03-05 23:34:07 +01:00
cybernet
ce4b40041b default tmp dir 2017-03-05 11:36:49 +02:00
System Void
8ae70316e9 Update index.php 2017-03-04 22:45:02 +00:00
Vengance
d84a547855 Update apache2.conf 2017-03-04 14:38:33 +01:00
Vengance
2f438842fd Update apache2.conf 2017-03-04 14:38:19 +01:00
Vengance
f853e5a1be Update apache2.conf 2017-03-04 14:38:04 +01:00
Vengance
18307e829a Update apache2.conf 2017-03-04 14:37:48 +01:00
Vengance
32baf3a87b Update apache2.conf 2017-03-04 14:37:32 +01:00
Vengance
92c64a9992 Update apache2.conf 2017-03-04 14:37:15 +01:00
Vengance
edd0527c56 Update apache2.conf 2017-03-04 14:37:00 +01:00
Vengance
f92c037a5a Update apache2.conf 2017-03-04 14:36:43 +01:00
Vengance
4cd6d7c9a1 Update apache2.conf 2017-03-04 14:36:26 +01:00
Vengance
9773a9f359 Update apache2.conf 2017-03-04 14:35:49 +01:00
Vengance
b444fb9b08 Update apache2.conf 2017-03-04 14:34:36 +01:00
Vengance
942c600749 Add Apache error documents 2017-03-04 14:30:49 +01:00
naumov-socolov
1e4063eb7a Merge pull request #1111 from developer-av/hotfix/1108
*Fix Proxy setting becomes unset by user*
2017-03-02 17:12:49 +03:00
Made I.T
7a96d9917e Merge pull request #1116 from serghey-rodin/madeITBelgium-laravel
Laravel templates #986
2017-03-02 13:53:14 +01:00
Made I.T
f7ca96690b Create laravel.stpl 2017-03-02 13:51:22 +01:00
Made I.T
58a55915e8 Create laravel.stpl 2017-03-02 13:51:07 +01:00
Made I.T
dbbee61efb Create laravel.stpl 2017-03-02 13:50:37 +01:00
Made I.T
b20131822d Create laravel.stpl 2017-03-02 13:50:23 +01:00
Made I.T
f3844ee344 Create laravel.stpl 2017-03-02 13:50:09 +01:00
Made I.T
679bccaf7c Create laravel.stpl 2017-03-02 13:49:53 +01:00
Made I.T
dae9596f35 Create laravel.stpl 2017-03-02 13:49:35 +01:00
Made I.T
866af00588 Create laravel.stpl 2017-03-02 13:49:15 +01:00
Made I.T
16881adae2 Create laravel.stpl 2017-03-02 13:49:02 +01:00
Made I.T
5faf27ee99 Create laravel.stpl 2017-03-02 13:48:39 +01:00
Made I.T
20a38a33c1 Create laravel.stpl 2017-03-02 13:48:14 +01:00
Made I.T
4dfe086957 Create laravel.stpl 2017-03-02 13:47:55 +01:00
Made I.T
f3b6589db3 Create laravel.stpl 2017-03-02 13:47:26 +01:00
Made I.T
488d5ca932 Create laravel.stpl 2017-03-02 13:47:07 +01:00
Made I.T
a7f9296271 Create laravel.stpl 2017-03-02 13:46:44 +01:00
Made I.T
819faa8d7c Create laravel.tpl 2017-03-02 13:45:30 +01:00
Made I.T
ae71a532c1 Update laravel.tpl 2017-03-02 13:45:05 +01:00
Made I.T
67a33046bb Create laravel.tpl 2017-03-02 13:43:48 +01:00
Made I.T
0adb71c583 Create laravel.tpl 2017-03-02 13:43:29 +01:00
Made I.T
9483c75514 Create laravel.tpl 2017-03-02 13:43:03 +01:00
Made I.T
5890b1b28f Create laravel.tpl 2017-03-02 13:42:50 +01:00
Made I.T
fedf6c5ccf Create laravel.tpl 2017-03-02 13:42:33 +01:00
Made I.T
b6fdc216b9 Create laravel.tpl 2017-03-02 13:42:18 +01:00
Made I.T
f5b823f814 Create laravel.tpl 2017-03-02 13:41:59 +01:00
Made I.T
4dfa77eab2 Create laravel.tpl 2017-03-02 13:41:41 +01:00
Made I.T
1f0cb58a32 Create laravel.tpl 2017-03-02 13:40:51 +01:00
Made I.T
2204a300f2 Create laravel.tpl 2017-03-02 13:40:38 +01:00
Made I.T
654d7ca83d Create laravel.tpl 2017-03-02 13:40:10 +01:00
Made I.T
a6b7d84dc0 Create laravel.tpl 2017-03-02 13:39:38 +01:00
Made I.T
c2193e1a6e Create laravel.tpl 2017-03-02 13:38:57 +01:00
Made I.T
09b2fcb218 Merge pull request #986 from rustem-art/patch-1
Laravel template
2017-03-02 13:35:31 +01:00
Made I.T
d9095aecdf Merge pull request #998 from elliot-labs/patch-2
Optimize Version Retrieval (Ubuntu)
2017-03-02 13:25:07 +01:00
Made I.T
5060176a5d Merge pull request #1000 from devsaider/master
added robots.txt which pervents indexing by search engines
2017-03-02 13:12:23 +01:00
Made I.T
041d7cb5b4 Merge pull request #1063 from corochoone/master
Fix loss of the owner / group / permissions of the configuration file…
2017-03-02 12:04:22 +01:00
Made I.T
9fed62e08f Merge pull request #1102 from cdnmall/patch-1
Fix fclose() incorrect variable
2017-03-02 11:35:14 +01:00
Made I.T
3dcc0ee96e Fix indent 2017-03-02 11:16:29 +01:00
Made I.T
8f8f257d3d Merge pull request #873 from sacrednetwork/fix-httpauth
Fix httpauth permission server error and secure template
2017-03-02 11:14:16 +01:00
Alex
1bc576c4c6 Delete empty echo ""; 2017-03-02 12:02:45 +02:00
Robin Dirksen
a5798a945e HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:58:42 +01:00
Robin Dirksen
9fc3f877cf HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:58:20 +01:00
Robin Dirksen
f532ca351b HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:57:59 +01:00
Robin Dirksen
9ca1a75a73 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:57:41 +01:00
Robin Dirksen
8134478e56 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:57:22 +01:00
Robin Dirksen
96f4e1ff10 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:56:59 +01:00
Robin Dirksen
f42cb0563b HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:56:39 +01:00
Robin Dirksen
3df95c99dd HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:56:22 +01:00
Robin Dirksen
6a74977579 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:56:02 +01:00
Robin Dirksen
6764196d72 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:55:37 +01:00
Robin Dirksen
1af0bfac93 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:54:45 +01:00
Robin Dirksen
2ac5b87c0b HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:54:24 +01:00
Robin Dirksen
12e81b5eae HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:53:38 +01:00
Robin Dirksen
79f4624889 HTTP2 support
Adds HTTP2 support for NGINX when using the http2 nginx template (only when HTTPS is enabled).
2017-03-02 10:53:15 +01:00
dpeca
aa9ed7e64e Merge pull request #1113 from madeITBelgium-patch-1, Delete empty echo "";
Delete empty echo "";
2017-03-02 10:52:21 +01:00
Robin Dirksen
f46e7cfb1d Create http2.tpl
No http2 support when HTTPS is not active...
2017-03-02 10:49:58 +01:00
Robin Dirksen
085924c5d2 Create http2.stpl
Use http2 for faster loading, this requires https.
2017-03-02 10:49:14 +01:00
Made I.T
f69d7adb54 Delete empty echo "";
Delete empty echo "";
2017-03-02 10:34:10 +01:00
Made I.T
422e60f396 Merge pull request #1112 from serghey-rodin/madeITBelgium-fix-owncloud
Fix ownlcoud.tpl duplicated /vstats #1041
2017-03-02 09:28:13 +01:00
Made I.T
b238ee031b Merge pull request #1041 from kamil7732/master
duplicate /vstats/ entry making nginx to crash
2017-03-02 09:27:40 +01:00
Made I.T
35471e52de Fix owncloud.tpl 2017-03-02 09:25:54 +01:00
Made I.T
f6cc621eea Fix owncloud.tpl 2017-03-02 09:25:35 +01:00
Made I.T
0dcabf6904 Fix owncloud.tpl 2017-03-02 09:25:17 +01:00
Made I.T
2c722e59d1 Fix owncloud.tpl 2017-03-02 09:25:01 +01:00
Made I.T
b4d504f416 Fix owncloud.tpl 2017-03-02 09:24:43 +01:00
Made I.T
0c2ce8f0d5 Fix owncloud.tpl 2017-03-02 09:24:10 +01:00
Made I.T
858a0a8f01 Fix owncloud.tpl 2017-03-02 09:23:50 +01:00
Made I.T
b1a16015e8 Fix owncloud.tpl 2017-03-02 09:23:31 +01:00
Made I.T
5ef185ca27 Fix owncloud.tpl 2017-03-02 09:22:24 +01:00
Made I.T
3e1aa7ba76 Fix owncloud.tpl 2017-03-02 09:21:35 +01:00
Made I.T
e5d3c70abd Fix owncloud.tpl 2017-03-02 09:21:09 +01:00
Made I.T
fe0fbf4c23 Fix owncloud.tpl 2017-03-02 09:20:07 +01:00
Made I.T
83c4ad70b3 Fix owncloud.tpl 2017-03-02 09:19:42 +01:00
Made I.T
282965de79 Fix owncloud.tpl 2017-03-02 09:18:33 +01:00
Alex
20fbf49785 *Fix Proxy setting becomes unset by user* 2017-03-02 07:52:57 +02:00
Arinerron
19ea994e56 Merge pull request #1 from serghey-rodin/master
Update fork
2017-03-01 19:43:30 -08:00
Robert Zambrano Hidalgo
b2b2e1560a Using Yum to install epel-release package 2017-02-28 20:09:47 -05:00
naumov-socolov
f5ef047df7 Merge pull request #1106 from serghey-rodin/madeITBelgium-csrf
Fix CSRF in login
2017-02-28 12:47:14 +03:00
Made I.T
516cd2b101 CSRF 2017-02-28 09:05:42 +01:00
Made I.T
9623be0708 CSRF 2017-02-28 09:01:30 +01:00
Dmitry Naumov-Socolov
f4aa36afbe Merge branch 'Arinerron-patch-1' 2017-02-27 17:25:11 -05:00
Joe Mattos
290086498c Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 01:02:10 -05:00
Joe Mattos
bf2b5672c2 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 01:01:29 -05:00
Joe Mattos
a0235ff66b Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 01:01:03 -05:00
Joe Mattos
86d663d9ac Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 01:00:21 -05:00
Joe Mattos
111c401ee0 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:59:54 -05:00
Joe Mattos
9d9884fdba Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:59:20 -05:00
Joe Mattos
5847fd87b6 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:58:46 -05:00
Joe Mattos
bf74f55b26 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:58:19 -05:00
Joe Mattos
a51348686d Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:57:52 -05:00
Joe Mattos
6bc522c4a7 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:57:24 -05:00
Joe Mattos
66cce9d35c Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:56:57 -05:00
Joe Mattos
df30dd1dd3 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:56:18 -05:00
Joe Mattos
f86b7e90fd Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:55:45 -05:00
Joe Mattos
0cb8c4d7d8 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:54:55 -05:00
Joe Mattos
71c5e91986 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:54:12 -05:00
Joe Mattos
2b563705eb Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:53:25 -05:00
Joe Mattos
9e4b7504ac Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:52:54 -05:00
Joe Mattos
ea85928ab6 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:52:25 -05:00
Joe Mattos
a59ac2204a Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:49:24 -05:00
Joe Mattos
2cdb4a9421 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:42:19 -05:00
Joe Mattos
3a0c82a202 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:41:44 -05:00
Joe Mattos
54125174cb Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:40:58 -05:00
Joe Mattos
25b0978dd3 Fix fclose() incorrect variable
fclose() is using incorrect variable $new_conf should be $fp to properly close fopen
2017-02-27 00:36:11 -05:00
Arinerron
c6393c8771 Patch session fixation vuln
Here's the documentation for that function:
http://php.net/manual/en/function.session-regenerate-id.php

And here's about session fixation:
https://www.owasp.org/index.php/Session_fixation
2017-02-26 17:30:36 -08:00
Vengance
dc89a43c3a Update v-add-sys-quota 2017-02-25 18:44:38 +01:00
Vengance
7973b34f63 Fix quota
Without this fix, the script tries to remount the filesystem read-only which (mostly) fails and returns an error.
Also, running quotacheck  two times is not needed.
2017-02-25 18:38:17 +01:00
dpeca
f014e38dae Merge pull request from Justin991q, Fixed typo in the backup script
Fixed typo in the backup script
2017-02-25 13:52:16 +01:00
Justin991q
b987054048 Fixed typo in the backup script 2017-02-25 03:38:53 +01:00
Maksim Usmanov | Maks
22084a79b6 Update main.sh 2017-02-22 15:20:26 +01:00
Maksim Usmanov | Maks
e64049af0e Fix DNS issue whit some characters
This will fix issues commented here: https://github.com/serghey-rodin/vesta/issues/1087

Changes:
1- Prevent user to add record as: record* or ** of *record only can add record if has * or *. so only valid wildcards
2- Prevent add records as record has record. record.. record-- record-
3- Prevent add records as -record .record and leave user add _record needed for dmarc, dkim and orther
4- prevent add dual special characters record..record or record--recoerd or record__record or record........record
2017-02-21 21:23:53 +01:00
System Void
593dd29956 Merge pull request #1088 from serghey-rodin/revert-1065-patch-12
Revert "Remove trailing dot"
2017-02-20 23:30:47 +00:00
System Void
19708d2837 Revert "Remove trailing dot" 2017-02-20 23:30:39 +00:00
Anton Reutov
e598d80708 Merge pull request #1010 from Piterden/master
[Fix] Pyrocms nginx config templates
2017-02-20 13:41:26 +03:00
System Void
605dae8774 Merge pull request #1037 from kmark/fix-letsenc-errors
Let's Encrypt fixes for #979 (invalid response) and #1008 (/tmp/*/domain.tld.crt file not found)
2017-02-20 10:31:16 +00:00
System Void
753f1aec39 Merge pull request #1082 from Skamasle/patch-13
Fix permissions issue ( security )
2017-02-19 23:19:59 +00:00
System Void
ce3c5e71d8 Merge pull request #1083 from Skamasle/patch-14
Fix permission ( security issue )
2017-02-19 23:19:26 +00:00
System Void
836ce135e6 Merge pull request #1084 from Skamasle/patch-15
Fix permisions
2017-02-19 23:18:57 +00:00
dpeca
b64e799eb1 Ubuntu 16.10 installer, coverting php7 to php7.0 package names 2017-02-19 21:12:30 +01:00
dpeca
309abec58f Fix for broken CentOS 7 installation because of latest fail2ban version
Fix for issue https://github.com/serghey-rodin/vesta/issues/1086
2017-02-18 16:54:20 +01:00
dpeca
9c84c5f9fe Making Ubuntu 16.10 to work with php7
Installer is tested
2017-02-17 16:19:22 +01:00
Maksim Usmanov | Maks
e14eb2e23e Fix permisions
As in debian and centos fix issue whit exposed passwords
2017-02-16 22:24:03 +01:00
Maksim Usmanov | Maks
9aed954068 Fix permission ( security issue )
In my debian 8 installs always /etc/roundcube/debian-db-roundcube.php has 644

/etc/roundcube/config.inc.php its ok 

But both files has roundcube mysql passwords and any one can read it.

I not know why are two files whit passwords one have correct permisions but fix bot 

I apply also for debian 7 but not sure if is affected
2017-02-16 22:13:48 +01:00
Maksim Usmanov | Maks
dfdaf8d80e Fix permissions issue ( security )
Same issue happen in debian, in my centos 6 installs always get /etc/roundcubemail/config.inc.php whit 644 whit roundcube password exposed.

In centos bad user:group is asigned so also fixed

This will be fixed in general update in current installed vestacp servers.
2017-02-16 22:11:29 +01:00
dpeca
39f0fa8761 Ubuntu: Fixed order of apt-get and adding archive apt source 2017-02-15 15:53:22 +01:00
Denis Efremov
f2872dd61e Limit 1 line for service name 2017-02-15 07:29:55 +03:00
dpeca
b753557617 Merge pull request #1076 from Piotr-Pht-Jasiek, Compability for ubuntu 16.10
Compability for ubuntu 16.10
2017-02-14 20:19:38 +01:00
Piotr Jasiek
93c6365f8c Update vst-install-ubuntu.sh
remove greeting from patch autor.
2017-02-14 18:22:57 +01:00
Piotr Jasiek
dfe86eab69 Compability for ubuntu 16.10
Finnaly solution for Ubuntu 16.10.

In this solution you have php5 and php7. After installation you can chose php version in nginx config file. Default php5
2017-02-14 17:59:12 +01:00
Made I.T
e19981fd81 Merge pull request #996 from serghey-rodin/madeITBelgium-patch-1
Update NL translation
2017-02-14 10:55:19 +01:00
Made I.T
ab32c4b4c4 Merge branch 'master' into madeITBelgium-patch-1 2017-02-14 10:55:00 +01:00
dpeca
86c422048f Merge pull request #1074 from gionniboy, fixed typo for DKIM
fixed typo for DKIM
2017-02-14 10:30:48 +01:00
Gionni
ddf010a214 fixed typo 2017-02-14 02:08:57 +01:00
Gionni
3b9bbe73f5 fixed typo 2017-02-14 02:07:56 +01:00
dpeca
672b0e6209 Merge pull request #1073 from Ar1sC/patch-1, Updated Greek Translation
Updated Greek Translation
2017-02-13 16:51:00 +01:00
Aris
50ff123251 Updated Greek Translation 2017-02-13 17:38:03 +02:00
System Void
5823ea4c87 Merge pull request #1003 from RickBakkr/patch-1
Force a new line, to prevent syntax errors.
2017-02-13 00:28:46 +00:00
System Void
fbaf05a432 Merge pull request #1006 from urosg80/master
fix for nginx less (apache only) installation
2017-02-13 00:27:56 +00:00
Anton Reutov
898fc0d877 Merge pull request #1007 from DaniWinter/master
Dutch translations
2017-02-11 22:23:22 +03:00
Anton Reutov
16fc0a69c3 Merge pull request #1057 from emtudo/master
fixed translate pt-BR
2017-02-11 22:17:21 +03:00
System Void
2d3038e68b Merge pull request #1039 from Skamasle/patch-11
Add unrar
2017-02-11 17:55:07 +00:00
System Void
b370cbf62b Merge pull request #1065 from Skamasle/patch-12
Remove trailing dot
2017-02-11 17:54:32 +00:00
System Void
b87246dad0 Merge pull request #1069 from Srgk/master
fix trailing dot quotes
2017-02-11 17:53:34 +00:00
Serge Kraev
cb53616e99 fix trailing dot quotes 2017-02-09 18:09:39 +04:00
Pavel Galkin
1d9be163db A little grammar fix
grammar error fix
https://twitter.com/ctepeo/status/829646922487046146
2017-02-09 17:08:36 +03:00
dpeca
ce5a304814 Debian installer: adding /usr/sbin/nologin to /etc/shells
Adapting installer to code changes from 039a989fb2 commit
2017-02-08 14:39:53 +01:00
Maksim Usmanov | Maks
50f08b7de8 Remove trailing dot
I check some servers and some times I see than cname not working, I check records and the problem is than some useres add record whit a dot ( in vesta GUI or CLI )

comerecord. in cname 2222 google.com

and vesta add it as it

cname.	14400	IN	CNAME		google.com.
test.	14400	IN	MX	10	mail.googl.com.

So whit this pull we remove that dot if added

hola	14400	IN	CNAME		test.net.
record	14400	IN	CNAME		hola.es.
recordar	14400	IN	CNAME		Tres.net.

This solve the dot but I think in a while loop, because vesta leave add users cname thiw multiple dots:

Adding DNS Record → Record cname.......sdd.net has been created successfully.

Maybe vesta team have better solution for this one.
2017-02-07 19:41:47 +01:00
corochoone
41b79d0cb9 Fix loss of the owner / group / permissions of the configuration file while overwriting it
With use "mv" command, configuration file owner, group and permission  will become "root: root" with default permissions. This can lead to access problem, because a services will cannot access to the configuration file. For example, "named", will cannot restart, because required user "named" access to own configuration file.

"Cat" command, will be overwrite config file too, but it saves owner / group / permissions original file.
2017-02-06 17:32:30 +04:00
Tulga
d248817f25 Update main.php 2017-02-03 03:33:39 +08:00
Tulga
cfb55d2dbc Update index.php
- php execution timeout disabled
- shell command "v-open-fs-file" is not suitable for large files. replaced with php readfile.
2017-02-03 01:37:07 +08:00
Tulga
efe267cfac Update main.php
improvement: jquery file upload, chunked file uploads enabled about 5mb
2017-02-03 01:29:50 +08:00
urosg80
6788f9e970 Merge branch 'master' into master 2017-02-01 14:08:52 +01:00
Leandro Henrique Reis
4a91d29fa1 fixed translate pt-BR 2017-01-31 08:29:51 -02:00
System Void
5500f3c2bd Merge pull request #972 from mslepko/master
Added additional domain parameter formatting when adding SSL for domain + Added missing Polish translations
2017-01-31 08:14:57 +00:00
Serghey Rodin
b5d52c7e8c fix interface duplicates 2017-01-30 16:00:04 +02:00
Pavel Galkin
3d9a5526df full bulgarian translation
full bulgarian translation for VestaCP by kronz
(https://forum.vestacp.com/memberlist.php?mode=viewprofile&u=9167) -
https://forum.vestacp.com/viewtopic.php?f=20&t=13217#p55678
2017-01-29 02:04:10 +03:00
Pavel Galkin
0ff8375d4d Revert "full bulgarian translation"
This reverts commit 092b135181.
2017-01-29 01:59:48 +03:00
Pavel Galkin
092b135181 full bulgarian translation
full bulgarian translation for VestaCP by kronz
(https://forum.vestacp.com/memberlist.php?mode=viewprofile&u=9167)
2017-01-29 01:56:05 +03:00
dpeca
92acd51a89 Merge pull request #1034 from cdnmall/patch-1
Fix for v-change-user-package too many arguments
2017-01-27 09:57:56 +01:00
darkworks
60b1651ef7 Update ur.php 2017-01-25 22:28:20 +05:00
darkworks
429b4d0220 Update ur.php 2017-01-25 22:13:56 +05:00
darkworks
37bd0d2404 Create ur.php 2017-01-25 22:13:15 +05:00
dpeca
2f73044746 Wrong order of steps in v-change-domain-owner, fixed 2017-01-25 14:47:32 +01:00
dpeca
a2dab6c94a To avoid chowning mail conf folder if it does not exists 2017-01-25 14:24:49 +01:00
FlatMat
a2d922cf0b Fix backend config generation 2017-01-22 22:10:36 +01:00
kamil
a5712fc533 duplicate /vstats/ entry making nginx to crash 2017-01-20 17:16:52 +01:00
Maksim Usmanov | Maks
d37ef80bf4 Add unrar
This is need for v-extract-fs-archive, unrar is available in debian but not in centos.

Maybe is better idea not support unrar because not is available in all OS
2017-01-19 23:41:06 +01:00
Kevin Mark
d4a4bca616 Allow checking of nginx domains with force-https
Fixes issue noted in serghey-rodin/vesta#979
2017-01-19 08:00:10 -05:00
Kevin Mark
443614a00f Do not change SSL certs if enabling Let's Encrypt
Fixes issue noted in serghey-rodin/vesta#1008
2017-01-19 07:48:51 -05:00
Serghey Rodin
310a379705 LetsEncrypt on apache-only fix for #966 2017-01-19 11:13:10 +02:00
Joe Mattos
649c04d650 Fix for v-change-user-package too many arguments
v-change-user-package: line 46: [: too many arguments
2017-01-16 16:59:10 -05:00
darkworks
5c9c33f763 Merge pull request #1 from darkworks/darkworks-patch-1
Unzip Archive overwrite fix
2017-01-14 22:12:06 +05:00
darkworks
28e34fdecb Unzip Archive overwrite fix
when zip archive is unzip it gives error  "" archive was not extracted ""  in case there were same files already present in the folder , its due to overwrite flag (-o) missing in unzip command used in vestacp
2017-01-14 22:11:22 +05:00
dpeca
a50fa85ef0 added verify_peer_name => false (Roundcube driver, CentOS 6) 2017-01-13 17:33:36 +01:00
dpeca
f137ec0f7b Roundcube driver fix for self-signed SSL (Ubuntu 16.04) 2017-01-13 17:27:20 +01:00
dpeca
c8f63642b0 Roundcube driver fix for self-signed SSL (Ubuntu 16.10) 2017-01-13 17:09:02 +01:00
dpeca
3a2cfa20fe added verify_peer_name => false (Roundcube driver, Debian) 2017-01-13 17:03:02 +01:00
dpeca
ae2d1609e2 Merge pull request #1020 from eka7a/patch-2 - reverting DKIM commit
Reverting 721731dbd5
2017-01-12 18:07:08 +01:00
dpeca
cfa557b22c Merge branch 'master' into patch-2 2017-01-12 18:03:44 +01:00
dpeca
927271acc3 Merge pull request #1021 from eka7a/patch-3
Added v=DKIM1; prefix
2017-01-12 17:58:00 +01:00
Serghey Rodin
e5950d516d Code refactoring: domain_idn + new restart routine 2017-01-11 16:52:11 +02:00
dpeca
b98abaf572 Fix for wrong variable from previous commit 2017-01-10 13:15:32 +01:00
dpeca
419a9b0b1a Fix for DKIM key permission in v-change-domain-owner
Fix is the same as for v-restore-backup - 7815539e91
2017-01-10 12:43:28 +01:00
Ekrem KAYA
e82b96eb7c Added v=DKIM1; prefix 2017-01-06 09:12:55 +02:00
Ekrem KAYA
3b04e343f2 No DNS record found
DKIM check on https://www.mail-tester.com/spf-dkim-check

Domain name: example.com
DKIM Selector: mail._domainkey.example.com

Results
No DNS record found for mail._domainkey.example.com
2017-01-06 09:09:10 +02:00
Serghey Rodin
8844f503f4 Merge branch 'master' of github.com:serghey-rodin/vesta 2017-01-04 15:26:25 +02:00
Serghey Rodin
e44db3d2b0 added verify_peer_name => false 2017-01-04 15:25:16 +02:00
Denis Efremov
48101b1665 Update v-change-sys-service-config 2016-12-31 18:23:33 +03:00
Denis Efremov
02a164128b Fixed restarting php daemon error. Ubuntu 16.04
```bash
# cat /proc/version
Linux version 4.4.0-21-generic (buildd@lgw01-21) (gcc version 5.3.1 20160413 (Ubuntu 5.3.1-14ubuntu2) ) #37-Ubuntu SMP Mon Apr 18 18:33:37 UTC 2016
```
2016-12-31 00:12:26 +03:00
Alexandr Loskutov
66ec02221e Обновление переводов
Обновил украинский и русский переводы до последней версии
2016-12-28 21:31:52 +02:00
dpeca
568f8cce11 Merge branch 'master' of https://github.com/serghey-rodin/vesta 2016-12-28 17:12:51 +01:00
dpeca
7815539e91 Fix for DKIM key permission after restoring backup 2016-12-28 17:11:41 +01:00
dpeca
8dc4a82cfd Prevent reloading DNS for first DKIM record 2016-12-28 15:41:39 +01:00
dpeca
073c0164f1 Better soultion for DKIM DNS reloading 2016-12-28 15:04:51 +01:00
dpeca
fbac2699a4 Removing AllowSupplementaryGroups for Ubuntu 16.10
The same already known issue as on all distributions...
2016-12-27 21:25:11 +01:00
dpeca
61a12e4cd9 Ubuntu fix when spamassassin isn't in startup list
Patch is ported from Debian installer (old and tested).
Fix for https://bugs.vestacp.com/issues/461
2016-12-27 17:21:00 +01:00
dpeca
8bfe11b86d Fixing missing mail._domainkey when adding domain
Closing issue https://github.com/serghey-rodin/vesta/issues/990
2016-12-27 16:58:37 +01:00
dpeca
e9ca075dd7 Adding border="1" for Apache process table
It was impossible to see where what column begins...
2016-12-27 15:49:09 +01:00
Piterden
ff25fece5b [Fix] Pyrocms nginx config templates 2016-12-24 18:12:27 +03:00
DaniWinter
11219e0de8 Update nl.php 2016-12-20 14:47:32 +01:00
DaniWinter
c59816382e NL Translations 2016-12-20 13:58:17 +01:00
Uros
a4917b6d06 fix for nginx less (apache only) installation
fixes problem with apache only installation where the certificate
challenge file is not written correctly
2016-12-20 10:34:45 +01:00
Rick Bakker
e757dc408a Force a new line, to prevent syntax errors.
When I enabled SFTP chroot, "Subsystem sftp internal-sftp" was put directly after "UsePAM yes" (Ubuntu 16.04.1), which made "UsePAM yesSubsystem sftp internal-sftp", which obviously caused a syntax error. I fixed this by manually dividing those two options.
2016-12-18 14:16:38 +01:00
Ruslan Devsaider
2cfa4c86ce added robots.txt which pervents indexing by search engines 2016-12-16 02:50:33 +03:00
Elliot Huffman
48bc33ad87 optimize version
Optimized the system that finds the version of the current running system.
2016-12-14 12:42:14 -05:00
Dmitry Naumov-Socolov
b103640a0f WEB/fixed nginx log notices 2016-12-13 17:07:47 -05:00
Serghey Rodin
8969cad0c8 Yakkety Yak configs 2016-12-13 15:53:57 +02:00
Serghey Rodin
fa4b66f8c7 creating le pipe in order to avoid std out errors 2016-12-13 15:01:16 +02:00
Serghey Rodin
70d0ca89d8 added vim-common for LE account registration support 2016-12-13 12:37:41 +02:00
Made I.T
b66f908b94 Update NL translation 2016-12-11 18:42:56 +01:00
Flat
f4366a7b3e Merge pull request #967 from Secretjail/patch-4
Update fa.php
2016-12-12 01:46:54 +09:00
Secretjail
974d626c66 Update fa.php 2016-12-11 19:58:57 +03:30
Skamasle
c1cbbd3eb4 Fix for mysql 5.7 when reset password
Whit mysql 5.7 when reset password db.conf not get updated because cant get new md5 hash

This will fix it

I not touch GRANT ALL queryes because all working fine whit that part and all passwords was changed, but maybe you want change it.
I see this bug may afect this function:

dump_mysql_database() 

But I not know fot what is used grep -v "Grants for" > $grants

So I not touch it because not know how test it :)
2016-12-09 20:42:27 +01:00
Serghey Rodin
04d617d756 MySQL 5.7 support. Fixes #959. Thanks Maks Skamasle! 2016-12-09 18:43:20 +02:00
Serghey Rodin
381da55889 forgot to add ^ 2016-12-08 16:48:28 +02:00
Serghey Rodin
039a989fb2 fix for aditional ftp accounts 2016-12-08 16:20:48 +02:00
Serghey Rodin
55a1bdefcb Workaround for OpenVZ/Virtuozzo 2016-12-08 15:41:04 +02:00
Serghey Rodin
bf699d7140 fix for memory chart 2016-12-08 14:30:10 +02:00
Yaroslav Snisar
f0dcb2bf0d Laravel template
It is a laravel nginx template for app based on Laravel framework.
Nginx conf from: https://laravel.com/docs/5.1/installation
2016-12-08 12:51:08 +02:00
naumov-socolov
56c4deb2b6 Merge pull request #980 from Estilate/master
Fixed issue #975 + Added missing spanish translations and fixed some spelling mistakes
2016-12-07 11:23:39 +03:00
Manuel Valle
a77b48760c Fixed 2 mistakes 2016-12-06 21:29:47 -03:00
Manuel Valle
41042e9973 Fixed spelling mistakes, added missing translations
I've read the full translation again and fixed a lot of spelling mistakes. I've also added new translations and I've made sure everything is named just in 1 way, I made rid of the sinonymous so everything is more understandable.
2016-12-06 21:22:15 -03:00
Manuel Valle
1adb0b54fb Fixed the key listing
Variable $key was returning the content from the file certificate.crt instead of certificate.key
2016-12-06 16:42:10 -03:00
Flat
6ce840fd28 Merge pull request #973 from myrevery/patch-1
Update cn.php
2016-12-05 03:10:42 +09:00
myrevery
6c55a19e66 Update cn.php
Add some translation and refine some details.
2016-12-02 14:50:06 -08:00
Michal Slepko
3fa2133a46 Added additional domain parameter formatting when adding SSL for domain 2016-12-02 21:06:08 +00:00
Dmitry Naumov-Socolov
c07c4f8505 WEB. File Manager, positioning hotkeys popup at the middle of the screen 2016-12-02 09:33:55 -05:00
Michal Slepko
fea7e8471e Added missing Polish translations 2016-12-01 22:25:12 +00:00
Secretjail
fcc841b1a3 Update fa.php 2016-11-29 22:23:51 +03:30
Dmitry Naumov-Socolov
a0cc554c97 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-11-29 05:14:01 -05:00
Dmitry Naumov-Socolov
0f774a28ec Merge branch 'ja2015-ja2015' 2016-11-29 05:13:25 -05:00
Dmitry Naumov-Socolov
9550550555 Merge branch 'ja2015' of https://github.com/ja2015/vesta 2016-11-29 05:12:28 -05:00
Flat
181ab38d46 Merge pull request #964 from nguyenngocphuongnb/master
Update Vietnamese language package
2016-11-29 18:49:45 +09:00
Ngoc Phuong
ef5727299c Update Vietnamese language package 2016-11-29 16:38:30 +07:00
Flat
32015dea41 Merge pull request #962 from Flatta/master
Language file update
2016-11-29 16:47:46 +09:00
Flat
69959f25b0 Update i18n/bg.php 2016-11-29 16:42:00 +09:00
Flat
dfea3e5e8d Merge branch 'master' of https://github.com/serghey-rodin/vesta
# Conflicts:
#	web/inc/i18n/fa.php
2016-11-29 16:29:59 +09:00
Anton Reutov
d2052533a4 Bulgarian language 2016-11-29 00:30:38 +03:00
Dmitry Naumov-Socolov
6817a96953 Merge branch 'ja2015' of https://github.com/ja2015/vesta into ja2015-ja2015 2016-11-28 16:12:48 -05:00
Anton Reutov
ecc2486551 Merge pull request #963 from Secretjail/patch-3
Update fa.php
2016-11-29 00:07:30 +03:00
Secretjail
899c1531c6 Update fa.php 2016-11-29 00:21:09 +03:30
Serghey Rodin
76d518bf86 dynamic name for php-fpm service 2016-11-28 15:45:45 +02:00
Flat
46302f6fe1 Update language files (i18n/*.php).
- Add missing key
  - 'Your certificate will be ...' (en.php)
  - 'no notifications'
  - 'configure'

- Fix several typos

- Sort keys

- Remove certain comments
2016-11-28 22:30:59 +09:00
Flat
f427c196f1 Use array() instead of [] 2016-11-28 21:03:17 +09:00
JA
5939012ab1 Change Menus and checkboxes disabled to hide 2016-11-28 10:15:04 +09:00
Dmitry Naumov-Socolov
741d44754d WEB. fixed #960 shortcuts layer positioning 2016-11-27 08:37:54 -05:00
Flat
5db4a6dd3b Merge branch 'master' of https://github.com/serghey-rodin/vesta 2016-11-27 14:20:36 +09:00
Flat
155791241f Make not to translate FTP username 2016-11-27 14:18:23 +09:00
dpeca
0a97b522a1 Merge pull request #961 from Secretjail/patch-2
Update fa.php
2016-11-27 00:43:44 +01:00
Secretjail
e2e45820c9 Update fa.php 2016-11-27 02:28:16 +03:30
Secretjail
021c4c5efe Update fa.php
update new text.
2016-11-27 01:48:31 +03:30
Flat
a41f594fb5 Update header.html 2016-11-27 00:12:12 +09:00
Flat
4134d83769 Update Japanese translation 2016-11-26 23:15:17 +09:00
Serghey Rodin
5003c5b819 fix for php-fpm on ubuntu 16.04 2016-11-25 21:26:26 +02:00
Serghey Rodin
65eb4c7fe8 fix mysql init for ubuntu 16.04 2016-11-25 21:03:26 +02:00
JA
d120654a9b I deleted extra spaces. 2016-11-26 03:44:29 +09:00
JA
efcde95a90 Disable checkboxes 'DNS Support', 'Mail Support' if they are set '0' in the package. 2016-11-26 02:55:53 +09:00
JA
cc15e4adad Disable WebUI header menu WEB, DNS, MAIL, DB, CRON, BACKUP if they are set "0" in the package. 2016-11-26 02:42:33 +09:00
Serghey Rodin
1820107da2 workaround for old ubuntu 2016-11-25 17:16:59 +02:00
Serghey Rodin
b262f81555 list only tpl files 2016-11-25 12:29:41 +02:00
Serghey Rodin
d93a769b9d nginx config update 2016-11-25 12:19:04 +02:00
Serghey Rodin
08247f2ce2 new dns templates 2016-11-25 12:09:33 +02:00
Serghey Rodin
29a0226120 Merge pull request #945 from ioannidesalex/patch-23
Fix php-fpm template
2016-11-25 12:44:42 +03:00
Dmitry Naumov-Socolov
f742c99641 WEB. additions to fix #915 2016-11-24 17:00:34 -05:00
Serghey Rodin
6ad6c0dbca rfc2047 in autoreply + utf8 headers 2016-11-24 17:07:14 +02:00
Serghey Rodin
930398cea4 Configure link for PostgreSQL 2016-11-24 16:45:24 +02:00
Serghey Rodin
fd507a8b08 Fix MySQL for service editor 2016-11-24 14:35:15 +02:00
Serghey Rodin
ec55d245e6 edit nginx conf 2016-11-24 14:17:19 +02:00
Serghey Rodin
68f5f2f59e Merge branch 'master' of github.com:serghey-rodin/vesta 2016-11-24 13:10:54 +02:00
Serghey Rodin
4212f90923 fix #949 reverting #0c98233 2016-11-24 13:10:41 +02:00
dpeca
b6fb5d75fd Exim enviroment fix for CentOS 7 2016-11-24 11:55:37 +01:00
Serghey Rodin
26d0a1f4e8 Merge pull request #942 from ioannidesalex/patch-20
Fix exim environment
2016-11-24 13:41:32 +03:00
Serghey Rodin
d2e1d71d0e Merge pull request #946 from ioannidesalex/patch-24
Optimize nginx file cache performance
2016-11-24 13:39:42 +03:00
Serghey Rodin
12727de879 Merge pull request #947 from Skamasle/patch-9
Exclude comments from fstab
2016-11-24 13:38:24 +03:00
Serghey Rodin
6fe10a3cbc Merge pull request #948 from ioannidesalex/patch-25
Spelling corrections Ubuntu installer
2016-11-24 12:59:38 +03:00
dpeca
f94e9944ec Exim disable_ipv6=true 2016-11-24 01:24:49 +01:00
Alexandros Ioannides
074ac47d3f Spelling corrections 2016-11-24 00:54:47 +02:00
Skamasle
6a3df3804d Exclude comments
In ubuntu and debian, by default are some comments including partition and script get creazy

I explain problem here ( ithink affect only debian )

https://github.com/serghey-rodin/vesta/issues/844

I think nothing get broken, in may test working, ( debian 7 )

I try exclude # before all test but cat -n add numbers and not found any orther solution.
2016-11-23 23:29:57 +01:00
dpeca
e4b4b8c171 htmlentities typo fix in edit_web template 2016-11-23 18:31:47 +01:00
Alexandros Ioannides
168fd81eaf Optimize file cache performance 2016-11-23 19:27:07 +02:00
Alexandros Ioannides
de809a3b3b Fix
Please check this out first.
2016-11-23 19:07:12 +02:00
Alexandros Ioannides
be06a055cc Support for Sendy nginx 2016-11-23 19:03:15 +02:00
Alexandros Ioannides
f2d6a629e5 Fix for environment
https://forum.vestacp.com/viewtopic.php?t=11083
2016-11-23 18:48:20 +02:00
Serghey Rodin
e28fc98ea0 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-11-23 18:30:45 +02:00
Serghey Rodin
df019a8e99 dynamic name for php-fpm init script 2016-11-23 18:30:30 +02:00
Serghey Rodin
9a0b31065e Merge pull request #927 from ioannidesalex/patch-5
Minor changes in installer
2016-11-23 19:21:42 +03:00
Serghey Rodin
7cddbc6bff Merge pull request #928 from ioannidesalex/patch-6
Add DMARC support
2016-11-23 19:20:21 +03:00
Serghey Rodin
ba75a1a6cf Merge pull request #929 from ioannidesalex/patch-7
Add DMARC Support
2016-11-23 19:20:06 +03:00
Serghey Rodin
1db5e5d9c0 Merge pull request #930 from ioannidesalex/patch-8
Minor nginx optimizations
2016-11-23 19:19:42 +03:00
Serghey Rodin
0af0ea2021 Merge pull request #931 from ioannidesalex/patch-9
Dovecot security hardening
2016-11-23 19:17:24 +03:00
Serghey Rodin
ebdb1c4109 Merge pull request #932 from ioannidesalex/patch-10
Dovecot fix for folders creation
2016-11-23 19:16:52 +03:00
Serghey Rodin
96047b6dd3 Merge pull request #933 from ioannidesalex/patch-11
Fix Gmail issue with IPv6 exim
2016-11-23 19:16:20 +03:00
Serghey Rodin
5803effffc Merge pull request #934 from ioannidesalex/patch-12
Security enhancements
2016-11-23 19:15:12 +03:00
Serghey Rodin
477fd78871 Merge pull request #935 from ioannidesalex/patch-13
Minor tweaks for roundcube
2016-11-23 19:14:36 +03:00
Serghey Rodin
266c4fdced Merge pull request #936 from ioannidesalex/patch-14
Fix PMA
2016-11-23 19:14:05 +03:00
Serghey Rodin
b928745f2f Merge pull request #937 from ioannidesalex/patch-15
Better backup compression
2016-11-23 19:13:31 +03:00
Serghey Rodin
b54b96228a new installer for ubuntu 2016-11-23 18:11:38 +02:00
Serghey Rodin
b8684ef5ad edit php.ini 2016-11-23 17:55:13 +02:00
Alexandros Ioannides
f04574d1f8 Better compression 2016-11-23 17:35:07 +02:00
Alexandros Ioannides
574eb894b9 Fix
It was required in the past (relevant thread was once posted in the Forum).
2016-11-23 17:25:05 +02:00
Alexandros Ioannides
de54d6d8bf Minor tweaks 2016-11-23 17:21:36 +02:00
Alexandros Ioannides
272774e880 Security enhancements 2016-11-23 16:47:30 +02:00
Alexandros Ioannides
8cf066ad9a Fix Gmail issue with IPv6 2016-11-23 16:40:56 +02:00
Alexandros Ioannides
6ac105b3aa Fix for folders creation 2016-11-23 16:39:20 +02:00
Alexandros Ioannides
103bdd7128 Security hardening 2016-11-23 16:38:31 +02:00
Alexandros Ioannides
931fc2b44e Minor optimizations
Minor optimizations
2016-11-23 16:32:52 +02:00
Alexandros Ioannides
e64ac51893 Add DMARC Support
Add DMARC Support
2016-11-23 16:18:17 +02:00
Alexandros Ioannides
343e323062 Add DMARC support
Add DMARC support
2016-11-23 16:16:53 +02:00
Alexandros Ioannides
b56b96f749 Minor changes 2016-11-23 16:09:36 +02:00
Serghey Rodin
00ca250b2c Merge pull request #926 from ioannidesalex/patch-4
Update vst-install.sh
2016-11-23 17:04:31 +03:00
Alexandros Ioannides
dd4a47806b Update vst-install.sh 2016-11-23 15:52:51 +02:00
Serghey Rodin
f0b7d6cb05 Merge pull request #881 from openbrasil/patch-7
Monit: update dovecot.conf
2016-11-23 15:02:40 +03:00
Serghey Rodin
dca3f54cde Merge pull request #882 from openbrasil/patch-8
Monit: update exim.conf
2016-11-23 15:02:27 +03:00
Serghey Rodin
40b86126b3 Merge pull request #883 from openbrasil/patch-9
Monit: update httpd.conf
2016-11-23 15:02:15 +03:00
Serghey Rodin
eb6b27d683 Merge pull request #884 from openbrasil/patch-10
Monit: update mysql.conf
2016-11-23 15:02:03 +03:00
Serghey Rodin
46aee8ccc5 Merge pull request #886 from openbrasil/patch-12
Monit: update spamassassin.conf
2016-11-23 15:01:51 +03:00
Serghey Rodin
11c1c8f2e0 Merge pull request #887 from openbrasil/patch-13
Monit: update sshd.conf
2016-11-23 15:01:38 +03:00
Serghey Rodin
d19283760a Merge pull request #889 from openbrasil/patch-15
Monit: update vesta-php.conf
2016-11-23 15:01:23 +03:00
Serghey Rodin
8279756ffb Merge pull request #888 from openbrasil/patch-14
Monit: update vesta-nginx.conf
2016-11-23 15:01:06 +03:00
Serghey Rodin
a787ef257d Merge pull request #885 from openbrasil/patch-11
Monit: update nginx.conf
2016-11-23 15:00:50 +03:00
Serghey Rodin
6cc761b38b Merge pull request #880 from openbrasil/patch-6
Monit: update clamd.conf
2016-11-23 15:00:35 +03:00
Serghey Rodin
6368cba545 Merge pull request #921 from ioannidesalex/patch-1
Fix for socket.tpl
2016-11-23 14:58:29 +03:00
Serghey Rodin
01328cee15 Merge pull request #923 from ioannidesalex/patch-3
Update vst-install-ubuntu.sh
2016-11-23 14:57:47 +03:00
Serghey Rodin
00ee85466c Merge pull request #922 from ioannidesalex/patch-2
Grammar & spelling corrections
2016-11-23 14:56:29 +03:00
Alexandros Ioannides
9eab8521a6 Update vst-install-ubuntu.sh 2016-11-23 13:19:32 +02:00
Alexandros Ioannides
cef781d48b Grammar & spelling corrections 2016-11-23 13:07:47 +02:00
Alexandros Ioannides
867f54f763 Update socket.tpl 2016-11-23 13:03:19 +02:00
Serghey Rodin
37bff18987 Merge pull request #859 from Skamasle/patch-8
Fix bug whit ns records in idn domains
2016-11-23 13:58:46 +03:00
Serghey Rodin
44cdc17a18 Merge pull request #892 from pcfreak30/hotfix/891
*Add better support for idn domains
2016-11-23 13:55:51 +03:00
Serghey Rodin
86634b3eb9 Merge pull request #910 from huloza/patch-5
web folder permission fix
2016-11-23 13:51:51 +03:00
Serghey Rodin
2b194c0a2e Fixed url and some typos. Thanks Rhyswilliamsza 2016-11-23 12:50:27 +02:00
Serghey Rodin
e5f917a970 dynamic proc_name for php-fpm 2016-11-23 11:29:52 +02:00
Serghey Rodin
9aae395aa2 purely dynamic path for php-fpm 2016-11-23 11:20:34 +02:00
Serghey Rodin
07321b2397 php location on ubuntu 16.04 2016-11-22 22:20:39 +02:00
Serghey Rodin
ae4994cd61 php on ubuntu 16.04 2016-11-22 22:06:49 +02:00
Serghey Rodin
b7cc9506cc LE SSL listing 2016-11-22 21:39:59 +02:00
Serghey Rodin
6d17a5b610 fix for new installs 2016-11-22 21:37:50 +02:00
Serghey Rodin
0067562b33 fix for ips on DigitalOcean 2016-11-22 21:35:42 +02:00
dpeca
9ab813feee Added a command that will download Dovecot logrotate script 2016-11-22 16:15:35 +01:00
dpeca
6b8be44b04 Fix for 'no_encryption' tag attribute 2016-11-22 15:59:08 +01:00
Serghey Rodin
32de381273 default configs for 16.04 2016-11-22 16:55:09 +02:00
Serghey Rodin
2e01ba2466 Merge pull request #914 from felipenovais/fix-path-phpmyadmin.inc-and-fix-static-assets-not-loading-on-webmail
(RHEL7) Fix path in phpmyadmin.inc and fix static resources (css, js, imgs) not loading in RoundCube
2016-11-22 17:44:03 +03:00
Serghey Rodin
905025712e Merge pull request #918 from serghey-rodin/madeITBelgium-patch-#236
Fix #236 dovecot logrotate
2016-11-22 17:42:33 +03:00
Serghey Rodin
da6ed8057f autorenew LetsEncrypt SSL 2016-11-22 16:35:10 +02:00
Serghey Rodin
7df680ae83 fix for ssl w/o LE 2016-11-22 16:34:23 +02:00
Serghey Rodin
028a7a5fe7 workaround for weird issue on OpenVZ 2016-11-22 14:17:51 +02:00
Serghey Rodin
48ba0f835c 0.9.8-17 notifications 2016-11-22 14:17:09 +02:00
Dmitry Naumov-Socolov
57dc24c86e WEB. slight ui label improvement 2016-11-22 07:08:04 -05:00
Dmitry Naumov-Socolov
02ac870ab7 WEB. templates fixed #915 2016-11-22 07:05:19 -05:00
dpeca
36a1a3d49b Reverting to jQuery 'change' method instead of 'on' method 2016-11-22 11:40:09 +01:00
dpeca
1441b2aa9c Typo fix at mail credentials block 2016-11-22 11:28:57 +01:00
Made I.T
222a25dda8 Dovecot logrotate 2016-11-21 23:17:07 +01:00
Made I.T
2acba38d1e Dovecot logrotate 2016-11-21 23:16:36 +01:00
Made I.T
d6ae37b856 Dovecot logrotate 2016-11-21 23:16:17 +01:00
Made I.T
9ab512ca1b Dovecot logrotate 2016-11-21 23:15:56 +01:00
Made I.T
1e8d02f766 Dovecot logrotate 2016-11-21 23:15:29 +01:00
Made I.T
caf1b23af3 Dovecot logrotate 2016-11-21 23:14:47 +01:00
Made I.T
7d1eb565dd Dovecot logrotate 2016-11-21 23:14:26 +01:00
Made I.T
2f0dc8fd2a Dovecot logrotate ubuntu 12.04 2016-11-21 23:13:47 +01:00
Made I.T
bc08ab0cb7 Dovecot logrotate debian 8 2016-11-21 23:12:41 +01:00
Made I.T
dc50ace24c Dovecot logrotate debian 7 2016-11-21 23:12:11 +01:00
Made I.T
491a0091c3 Dovecot logrotate centos 5 2016-11-21 23:11:33 +01:00
Made I.T
e0670d9c4e Centos 6 2016-11-21 23:10:59 +01:00
Made I.T
f391f52228 Dovecot logrotate centos 7
fix #236
http://wiki2.dovecot.org/Logging
2016-11-21 23:08:57 +01:00
dpeca
32bd7f764f Renaming upgrade scripts to make it clear it support older version of CentOS and Debian 2016-11-20 00:01:18 +01:00
dpeca
70d26175ea Final adjustment for update-centos7 and update-debian8 2016-11-18 09:48:43 -05:00
Felipe Novais
25f4e0e158 RHEL/CentOS7 Problems - Fix path in phpmyadmin.inc and fix static resources (css, js, imgs) not loading in RoundCube 2016-11-18 03:08:13 -02:00
dpeca
37fa99b757 Updating update-centos7-v16-to-v17.sh, /var/run ownership 2016-11-17 18:17:38 +01:00
dpeca
f799572f1a Missing character 2016-11-17 17:55:38 +01:00
dpeca
fa73d16538 Correcting path for clamav-daemon.service 2016-11-17 17:44:01 +01:00
dpeca
17096714ed Persistent fix for /var/run/clamav permissions 2016-11-17 14:43:17 +01:00
dpeca
dfebb3fec7 Updating update-debian8-v16-to-v17.sh, ClamAV fixes 2016-11-17 14:38:04 +01:00
dpeca
c8d5e32c7e Updating update-debian8-v16-to-v17.sh 2016-11-17 02:40:56 +01:00
dpeca
49e24a2c1e Update v16 to v17 script for CentOS 7 2016-11-17 02:32:52 +01:00
dpeca
df2a2cc70b Update v16 to v17 script for Debian 8 2016-11-16 20:48:23 +01:00
dpeca
2f2fc5bafd Merge pull request #912 from orwah/patch-2
Update language file ar.php
2016-11-16 20:27:03 +01:00
Orwah Issa
c0e5ee4ea6 Update ar.php
complete arabic translation
2016-11-16 20:03:14 +02:00
dpeca
60c4b08258 Check if RemoteIP module is already activated 2016-11-16 19:02:17 +01:00
Serghey Rodin
0684f3af15 Release 0.9.8-17 2016-11-15 12:19:32 +02:00
Serghey Rodin
92efe51b08 aligining user top panel 2016-11-15 11:29:49 +02:00
Serghey Rodin
a10d358e7c user notification panel 2016-11-15 11:24:46 +02:00
Serghey Rodin
c0290f7137 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-11-15 11:22:35 +02:00
Dmitry Naumov-Socolov
61a1005bdc WEB. fixed emplty list toggle all 2016-11-14 18:37:10 -05:00
Serghey Rodin
5a5a528874 LE template for user accounts 2016-11-14 15:54:32 +02:00
Serghey Rodin
82b51724a7 restart webserver if docroot has changed 2016-11-14 15:54:16 +02:00
Dmitry Naumov-Socolov
515b28cc75 WEB. Fixed error notification area height issue 2016-11-14 07:04:29 -05:00
Dmitry Naumov-Socolov
4539932470 WEB. Fixed notification area height issue 2016-11-14 07:01:11 -05:00
dpeca
f294dc1b2a Fix for /var/run/clamav on CentOS 7
Fix for https://bugs.vestacp.com/issues/393

Solution taken from https://forum.vestacp.com/viewtopic.php?f=40&t=11044#p42704
2016-11-11 18:42:31 +01:00
huloza
4348aab7ad web folder permission fix
710 permission on /home/user/web (September 7 commit) is generating this Apache error on new users: 
Forbidden
You don't have permission to access /index.php on this server.
Server unable to read htaccess file, denying access to be safe
2016-11-11 13:00:14 -04:00
dpeca
ed9450f117 Commenting previously added code in /web/add/index.php 2016-11-11 13:06:12 +01:00
dpeca
4bb8a3f09e Fix for quote characters in user logs returned as JSON
Fix for https://bugs.vestacp.com/issues/413
2016-11-11 12:57:46 +01:00
Serghey Rodin
9bf86eaabd LE installation 2016-11-11 00:28:24 +02:00
Serghey Rodin
5096b36c17 v-schedule-letsencrypt-domain 2016-11-11 00:27:55 +02:00
Serghey Rodin
3a73db2a99 update LE key 2016-11-11 00:27:31 +02:00
Serghey Rodin
052da3ae9d compact syntax for proxy restart 2016-11-11 00:27:11 +02:00
Serghey Rodin
b5b9069ece compact syntax for web restart 2016-11-11 00:25:31 +02:00
Serghey Rodin
bea30a0896 compact syntax for web restart 2016-11-11 00:24:58 +02:00
Serghey Rodin
20ebed376c update LE queue 2016-11-11 00:24:24 +02:00
Serghey Rodin
15e7887cd5 added scheduled LE install 2016-11-09 17:52:10 +02:00
Serghey Rodin
56182cecf4 fixes #906 2016-11-09 17:47:54 +02:00
Serghey Rodin
dabb19573c fixed LE status check 2016-11-09 17:47:15 +02:00
Serghey Rodin
47bdaeb1f5 user notification support 2016-11-09 17:46:38 +02:00
Serghey Rodin
a2251186e9 user notification in main func inc 2016-11-09 17:46:12 +02:00
Serghey Rodin
51be240bd4 smarter way to use restart command in other scripts 2016-11-09 17:45:43 +02:00
dpeca
8df1d74ae3 Using public IP instead of internal IP when creating DNS
Gets public IP from 'v-list-user-ips' command (that reads /vesta/data/ips/ip), precisely from 'NAT' field
2016-11-06 21:21:19 +01:00
dpeca
098a454704 Merge pull request #903 from PeterDaveHello/i18n-tw-update
update TW translation
2016-11-05 16:49:37 +01:00
dpeca
003c7356c4 Merge pull request #902 from admf/patch-1
Update pt-BR.php (brazilian translations)
2016-11-05 16:47:15 +01:00
Peter Dave Hello
99a3b6e35d update TW translation 2016-11-05 21:35:20 +08:00
ADMF
0dd4388998 Update pt-BR.php 2016-11-05 05:30:28 -02:00
ADMF
69a61a65ff Update pt-BR.php 2016-11-05 05:22:22 -02:00
ADMF
539eba7302 Update pt-BR.php 2016-11-05 04:37:48 -02:00
dpeca
ad0d9fd109 Merge pull request #901 from fengkaijia/patch-2
Update Chinese translation
2016-11-05 02:57:23 +01:00
Kaijia Feng
8df594f207 Update cn.php 2016-11-05 09:53:25 +08:00
dpeca
b14d1e53d4 Merge pull request #899 from huloza/patch-2
corrected and added translations LetsEncrypt GUI
2016-11-04 20:49:11 +01:00
huloza
66acff5f8c corrected and added translations LetsEncrypt GUI
corrected some and added translations for new LetsEncrypt GUI
2016-11-04 15:00:17 -04:00
dpeca
01727508c3 Merge pull request #896 from malsony/master
Update of web/inc/i18n/cn.php
2016-11-04 11:46:19 +01:00
malsony
df27b78168 Update of web/inc/i18n/cn.php
Small fixes of web/inc/i18n/cn.php
2016-11-04 17:58:56 +08:00
Serghey Rodin
45f0000a55 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-11-04 11:43:00 +02:00
dpeca
ae5aa156f7 Fix for quote characters in user logs returned as JSON
Fix for https://bugs.vestacp.com/issues/413
2016-11-02 21:42:44 +01:00
dpeca
d95f0010b8 Enabling real-IPs in Apache2 logs in /upd/switch_rpath.sh 2016-10-31 16:59:18 +01:00
Dmitry Naumov-Socolov
e8632ccd48 WEB. Improved additional navigation bar. Templates 2016-10-31 11:12:49 -04:00
Dmitry Naumov-Socolov
a49ab973ab WEB. Improved additional navigation bar 2016-10-31 10:53:49 -04:00
Dmitry Naumov-Socolov
6195a5f0eb WEB. Added hint to star icon 2016-10-31 10:29:53 -04:00
dpeca
92e7b970ec Exclude libmail-dkim-perl if spamassassin will not be installed 2016-10-31 14:08:39 +01:00
Serghey Rodin
f89a666543 LE cronjob for sys queue 2016-10-31 12:00:14 +02:00
dpeca
a2fa6b7215 libmail-dkim-perl added to vst-install-debian.sh
According to issue https://github.com/serghey-rodin/vesta/issues/870
2016-10-31 02:59:23 +01:00
Serghey Rodin
addd9a8f02 notification centre improvements 2016-10-28 17:55:58 +03:00
Serghey Rodin
1bb6ecb2ba Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-28 16:14:12 +03:00
Dmitry Naumov-Socolov
ceba42fba0 WEB/MAIL. fixed typos 2016-10-27 07:41:46 -04:00
Dmitry Naumov-Socolov
0e18fc669a WEB. Improved Lets Encrypt interface 2016-10-27 07:17:03 -04:00
dpeca
e91f5c6da8 Subroutine for mod_remoteip in /bin/v-delete-sys-ip 2016-10-26 04:26:50 +02:00
dpeca
3aeec7ce74 Added check to see if mod_remoteip is installed
Sorry because I forgot to add it in previous commit
2016-10-26 04:15:27 +02:00
dpeca
579b1acd80 Subroutine for mod_remoteip in /bin/v-add-sys-ip 2016-10-26 04:00:54 +02:00
dpeca
654838bfc8 More informative error for long MySQL username
We talked about it at https://github.com/serghey-rodin/vesta/issues/860 issue
2016-10-26 02:53:03 +02:00
dpeca
785d5dd261 Typo fix in edit_mail_acc.html 2016-10-25 16:49:50 +02:00
dpeca
d13280a2f0 Update pt-BR.php language (pushed as PR from openbrasil user)
Couldn't merge that PR - https://github.com/serghey-rodin/vesta/pull/864
2016-10-25 02:26:05 +02:00
dpeca
4f54ff4f3f Changing password_vesta_host to server hostname during installation
Ported from Debian installer
2016-10-24 22:19:24 +02:00
dpeca
ad05c575d2 Allow Vesta Roundcube driver to comunicate with server even there is self signed SSL cert.
Previously fsockopen failed to connect on self-signed SSL cert.
Code ported from Debian Vesta Roundcube driver.
2016-10-24 22:05:02 +02:00
dpeca
7743f3b08e Allow Vesta Roundcube driver to comunicate with server even there is self signed SSL cert.
Previously fsockopen failed to connect on self-signed SSL cert.
Code ported from Debian Vesta Roundcube driver.
2016-10-24 22:03:19 +02:00
dpeca
6a955cd794 Fixing a bug that caused $pub_ip is always empty string
Putting update-firewall before getting $pub_ip is fixing this issue
2016-10-24 18:24:59 +02:00
dpeca
862e26200c Fixing a bug that caused $pub_ip is always empty string
Putting update-firewall before getting $pub_ip is fixing this issue
2016-10-24 18:22:49 +02:00
Serghey Rodin
a2cb705de9 Adding LE key on domain creation 2016-10-24 18:15:34 +03:00
Serghey Rodin
008942f642 Minor LE formatting 2016-10-24 18:15:07 +03:00
Serghey Rodin
edca05828d Deleted LE key from default shell listing 2016-10-24 18:14:35 +03:00
Derrick Hammer
a0cf86cd28 *Add better support for idn domains 2016-10-23 19:06:38 -04:00
WebZation
bd003a2064 Update vesta-php.conf
Update to CentOS 7 comand!
2016-10-22 02:29:35 -02:00
WebZation
c628028372 Update vesta-nginx.conf
Update to CentOS 7 comand!
2016-10-22 02:28:59 -02:00
WebZation
c5bb40461c Update sshd.conf
Update to CentOS 7 comand!
2016-10-22 02:25:14 -02:00
WebZation
f477d943b8 Update spamassassin.conf
Update to CentOS 7 comand!
2016-10-22 02:23:22 -02:00
WebZation
5d97513abc Update nginx.conf
Update to CentOS 7 comand!
2016-10-22 02:22:27 -02:00
WebZation
d836fb2bc4 Update mysql.conf
Update to CentOS 7 comand!
2016-10-22 02:21:39 -02:00
WebZation
ff2a910392 Update httpd.conf
Update to CentOS 7 comand!
2016-10-22 02:19:12 -02:00
WebZation
55b4ca5f43 Update exim.conf
Update to CentOS 7 comand!
2016-10-22 02:17:50 -02:00
WebZation
a47546e194 Update dovecot.conf
Update to CentOS 7 comand!
2016-10-22 02:17:09 -02:00
WebZation
7baf0532fc Update clamd.conf
Update to CentOS 7 comand!
2016-10-22 02:16:13 -02:00
Dmitry Naumov-Socolov
be837cb3e5 WEB. Lets Encrypt changed listing key 2016-10-21 11:02:23 -04:00
Dmitry Naumov-Socolov
9e3474fa30 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-20 09:38:08 -04:00
Dmitry Naumov-Socolov
b7128ddc72 WEB. Replaced split with explode. This closed #878 2016-10-20 09:37:41 -04:00
Serghey Rodin
db04a00bca Merge pull request #877 from pcfreak30/feature/800
Letsencrypt Improvements
2016-10-20 16:04:29 +03:00
Dmitry Naumov-Socolov
d61b4f3159 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-20 04:09:43 -04:00
Dmitry Naumov-Socolov
7cdbe58c32 WEB. Fixed bulk actions form id 2016-10-20 04:09:15 -04:00
Ramael Metatron
0a51da2590 Added validation if file exists
Added validation if file exists to not create, avoiding error when adding additional users with this command.
2016-10-20 00:40:28 -05:00
dpeca
5356e95d2f Fixing a bug that caused $pub_ip is always empty string
Putting update-firewall before getting $pub_ip is fixing this issue
2016-10-20 00:57:12 +02:00
Derrick Hammer
d0dd8f396e Merge branch 'master' into feature/800 2016-10-19 14:23:01 -04:00
dpeca
6531834def Enabling real-IPs in Apache2 logs 2016-10-19 14:06:44 +00:00
dpeca
902a7c975a Removing the malfunctioning RPAF Apache2 module and substituting it with a working RemoteIP module 2016-10-19 13:37:52 +00:00
Derrick Hammer
1b287ff73e Merge branch 'master' into feature/800
Conflicts:
	web/js/pages/edit_web.js
2016-10-18 18:30:45 -04:00
Derrick Hammer
c2f39cee39 *Fix shell alignment of LETSENCRYPT 2016-10-18 18:24:20 -04:00
Derrick Hammer
420290bc91 *Fix shell alignment of LETSENCRYPT 2016-10-18 18:21:52 -04:00
Derrick Hammer
f17fcc1f2e *Add letsencrypt to output 2016-10-18 18:19:11 -04:00
Derrick Hammer
54d4d9f60d *Fix markup error 2016-10-18 18:12:13 -04:00
Derrick Hammer
dc374f5d98 *Fix alignment of letsencrypt 2016-10-18 18:11:03 -04:00
Derrick Hammer
53dfc584a2 *Puts letsencrypt on its own row 2016-10-18 18:08:32 -04:00
Derrick Hammer
0ee268dc0b *Add empty check 2016-10-18 18:07:12 -04:00
Derrick Hammer
1a7c3baade *Show if letsencrypt is on 2016-10-18 18:05:16 -04:00
Dmitry Naumov-Socolov
31b55f31cc WEB/WEB. Improved Lets Encrypt stats auth layouts 2016-10-18 17:54:02 -04:00
Derrick Hammer
5d705da592 *Add original delete SSL logic back 2016-10-18 17:53:51 -04:00
Derrick Hammer
4f0badee79 *Remove flawed SSL logic 2016-10-18 17:47:34 -04:00
Derrick Hammer
d7a4697ad5 *Only update letsencrypt UI if its checked 2016-10-18 17:44:33 -04:00
Derrick Hammer
8624b00ad1 *Call v-delete-letsencrypt-domain not v-add-letsencrypt-domain 2016-10-18 17:42:49 -04:00
Dmitry Naumov-Socolov
11247009d4 WEB/MAIL. Fixed option hover color at mail configuration helper 2016-10-18 16:29:54 -04:00
Dmitry Naumov-Socolov
447a31b419 WEB/WEB. Removed SSL info if ssl is not enabled 2016-10-18 16:19:34 -04:00
Serghey Rodin
602d6cd4cf Merge pull request #804 from pcfreak30/feature/800
Add GUI support for letsencrypt
2016-10-18 17:00:57 +03:00
Dmitry Naumov-Socolov
fbfdd51cc0 WEB/MAIL. Added webmail url to the mail configuration helper 2016-10-17 18:58:11 -04:00
Dmitry Naumov-Socolov
e6a3aac07b WEB/MAIL. Fixed html for mail configuration helper 2016-10-17 15:14:44 -04:00
Dmitry Naumov-Socolov
f18fac79e0 WEB/MAIL. Fixed css typo 2016-10-17 12:07:42 -04:00
Dmitry Naumov-Socolov
1c82483734 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-17 12:01:11 -04:00
Dmitry Naumov-Socolov
5c30f7c2d2 WEB / MAIL. Updated mail acc options for different IMAP and SMTP configurations 2016-10-17 12:00:35 -04:00
Serghey Rodin
7f2e2fb8d4 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-17 18:02:02 +03:00
Dmitry Naumov-Socolov
45d5e885a4 FileManager. Updated rights with numeric field 2016-10-17 10:45:45 -04:00
Dmitry Naumov-Socolov
20acf12a54 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-17 10:24:48 -04:00
Ramael Metatron
7b2b895d57 Remove symlink to httpauth config files 2016-10-16 19:37:04 -05:00
Ramael Metatron
b44fcd8929 defined secure configs as separate variables 2016-10-16 19:30:04 -05:00
Ramael Metatron
60df6eea56 change secure config to symlink of non
symbolic link prevent duplicate file data to maintain
2016-10-16 19:23:06 -05:00
Ramael Metatron
ea03be3677 fix permissions error, create secure config
fix group permission error by assigning to user.
copy config files to s config template.
2016-10-16 15:15:55 -05:00
dpeca
c9b25905fb Merge pull request #869 from demlasjr/patch-2
Completely translated .ro
2016-10-14 01:35:08 +02:00
demlasjr
4578855341 Completely translated .ro
I want to thank one of my romanian friend who helped me.
I hope there are no (huge) mistakes. :)
2016-10-14 01:30:27 +02:00
dpeca
b4ee0d8032 Merge pull request #868 from demlasjr/patch-1
Updated translations for missing lines
2016-10-13 23:07:17 +02:00
demlasjr
ea490f2de6 Updated translations for missing lines 2016-10-13 22:58:59 +02:00
Derrick Hammer
8ef2f19a5e *Add missing crt variable 2016-10-13 09:00:04 -04:00
dpeca
cf1a7329e9 Roundcube tinyMCE fix for Debian 8 2016-10-12 20:02:18 +00:00
Serghey Rodin
fa2ece8139 missing delimiter 2016-10-11 17:51:54 +03:00
Serghey Rodin
a9142eddc6 fix for advanced menus on php-pfp 2016-10-11 17:51:14 +03:00
dpeca
6bf6cbd6d0 Improving translation for mysql user length, fixing tabs, enabling mysql limit note for MariaDB too, adding documentation for is_it_mysql_or_mariadb() PHP function 2016-10-11 00:34:41 +00:00
Flat
3b42d0a941 Merge pull request #865 from mslepko/master
Updated scripts description
2016-10-10 03:22:34 +09:00
Michal Slepko
3a2ed2cce5 Updated scripts description 2016-10-09 19:14:57 +01:00
Derrick Hammer
aa400746d3 Merge branch 'master' of https://github.com/serghey-rodin/vesta into feature/800 2016-10-09 07:29:03 -04:00
System Void
70dc71dfb0 Merge pull request #862 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2016-10-09 00:50:08 +01:00
The Gitter Badger
26f574631d Add Gitter badge 2016-10-08 23:46:26 +00:00
Derrick Hammer
09e1238d54 Merge branch 'master' into feature/800
Conflicts:
	web/edit/web/index.php
2016-10-08 11:22:23 -04:00
Serghey Rodin
7eb7a81c0a delete config only when there is no domain 2016-10-08 13:49:41 +03:00
Skamasle
0c98233f2e Fix bug whit ns records in idn domains
This will fix https://github.com/serghey-rodin/vesta/issues/845

Named wont start whit unicode charcters and return:

zone example.com/IN: loaded serial 2016100705
dns_rdata_fromtext: /home/admin/conf/dns/españa.es.db:18: near 'ns2.españa.com.': bad name (check-names)
zone xn--espaa-rta.es/IN: loading from master file /home/admin/conf/dns/españa.es.db failed: bad name (check-names)
2016-10-07 19:58:35 +02:00
dpeca
8cabb5414a Adding note about max length of mysql username 2016-10-07 17:41:27 +00:00
dpeca
ba91d1fd78 Typing mistake fix 2016-10-06 23:36:37 +00:00
dpeca
22b6ab4e2f Adding options for different IMAP and SMTP configurations 2016-10-06 23:25:50 +00:00
Serghey Rodin
a14556d486 unofficial google nearline support 2016-10-06 23:07:48 +03:00
Serghey Rodin
137f2580ea Merge pull request #843 from Skamasle/patch-6
Fix bug, fail display results whit some locales.
2016-10-06 19:17:11 +03:00
Serghey Rodin
82d0dd0ee4 Merge pull request #834 from serghey-rodin/SysVoid-patch-1
Fixed bin
2016-10-06 18:58:44 +03:00
Serghey Rodin
126104681d Language files update :: SSL Keys 2016-10-06 18:53:23 +03:00
Serghey Rodin
997990a2c4 Update SSL info 2016-10-06 18:52:55 +03:00
Serghey Rodin
7b0a2e904a Vesta SSL Certificate Management 2016-10-06 18:52:34 +03:00
Serghey Rodin
e343bf62a0 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-10-06 16:10:18 +03:00
naumov-socolov
4d258f6aca Merge pull request #855 from openbrasil/patch-1
Update pt-BR.php
2016-10-06 15:39:04 +03:00
naumov-socolov
2a80b71f26 Merge pull request #852 from Ham3D/master
Translating to Persian
2016-10-06 15:37:37 +03:00
Dmitry Naumov-Socolov
af249b542c Merge branch 'Ham3D-master' 2016-10-06 08:37:15 -04:00
Dmitry Naumov-Socolov
04bf8e4f18 Merge branch 'master' of https://github.com/Ham3D/vesta into Ham3D-master 2016-10-06 08:35:06 -04:00
Serghey Rodin
6b94292f2d Detailed info about installed SSL certificate 2016-10-06 11:43:59 +03:00
Serghey Rodin
e05e01d007 connect info on edit page 2016-10-06 11:25:32 +03:00
Serghey Rodin
4186ea0617 styling for configure links 2016-10-05 17:21:49 +03:00
Serghey Rodin
8eb499d239 fixed ftp-path issue 2016-10-05 17:15:59 +03:00
Serghey Rodin
281a515b72 added config links in server section 2016-10-05 15:52:03 +03:00
WebZation
2312993d31 Update pt-BR.php
Some corrections and translations into the Portuguese language of Brazil
2016-10-05 02:56:42 -03:00
Serghey Rodin
c2c8b0ed2b Fix for missing NetworkManager on OpenVZ/Virutozzo 2016-10-03 14:54:03 +03:00
Ham3D
0d39823b7c Translating more Strings 2016-09-30 19:59:19 +03:30
naumov-socolov
91b7144f02 Merge pull request #837 from devius/patch-1
Create ka.php
2016-09-30 17:27:40 +03:00
Serghey Rodin
945551dcd0 Workaround for DigitalOcean network 2016-09-30 14:47:51 +03:00
Serghey Rodin
ba5bdb12ca forcibly disable apache when it is not used 2016-09-30 12:40:17 +03:00
Serghey Rodin
0734b309e7 unlimited disk quota by default 2016-09-30 12:35:18 +03:00
Serghey Rodin
1efe457a22 reject pma setup after install 2016-09-30 12:27:14 +03:00
Serghey Rodin
24a687a75e fix for domain owner search 2016-09-29 23:51:22 +03:00
Serghey Rodin
1ed8188782 fix SOA update from Lónyai Gergely 2016-09-29 23:43:59 +03:00
Serghey Rodin
fc2ecb22b7 fixed error code in mailalias function 2016-09-29 23:40:44 +03:00
Serghey Rodin
1113e1f807 ftp users with nologin shell by default 2016-09-29 23:15:01 +03:00
Serghey Rodin
44be086dfc awstats/webalized fix for php-fpm systems 2016-09-29 23:05:39 +03:00
devius
ac88fe905f main menu rework
Shorten main menu items to fit
2016-09-29 15:02:17 +04:00
devius
94a7339ff8 File manager
shorten menu title, now it does not break design layout
2016-09-29 14:35:37 +04:00
Serghey Rodin
cda3caebb6 fix permission for pem file 2016-09-29 12:01:57 +03:00
anton-reutov
7ca19980e5 Merge pull request #850 from cornerot/patch-2
change "dns domains" to "web domains"
2016-09-27 22:14:02 +03:00
cornerot
6d4c4d90d8 change "dns domains" to "web domains" 2016-09-27 19:35:50 +04:00
Derrick Hammer
c85967f894 *Add support for aliases 2016-09-25 03:00:13 -04:00
Derrick Hammer
4daa17f54f Merge branch 'master' into feature/800
Conflicts:
	bin/v-add-letsencrypt-user
2016-09-25 02:37:42 -04:00
anton-reutov
a575bff950 Merge pull request #848 from ioannidesalex/patch-1
Spelling corrections
2016-09-22 22:53:54 +03:00
ioannidesalex
e5f49c402d Spelling corrections 2016-09-22 21:54:41 +03:00
naumov-socolov
e8c00ca2a7 Merge pull request #841 from theel0ja/patch-1
Improved finnish translation
2016-09-20 17:56:11 +03:00
devius
42bcc6d26f Update ka.php 2016-09-19 02:59:14 +04:00
devius
87c62f4fe2 Update ka.php 2016-09-19 02:54:19 +04:00
Skamasle
29c5f93475 Update v-list-sys-services
Printf work fine but fail whit some locales -> https://forum.vestacp.com/viewtopic.php?f=17&t=12585

In my test this work as well as printf but not is afected to locale problems.
2016-09-18 23:59:08 +02:00
Elias Ojala
59be8131eb small update 2016-09-17 09:20:22 +03:00
Elias Ojala
12bc70d8b7 Improved finnish translation 2016-09-17 01:44:14 +03:00
Serghey Rodin
f33ce7ecb2 Fixed Fail2ban install issues 2016-09-15 17:03:37 +03:00
Serghey Rodin
e0876153dc Merge branch 'master' of github.com:serghey-rodin/vesta 2016-09-15 14:45:40 +03:00
Serghey Rodin
5a5668f866 fix from http://luiscachog.me/spamassassin-error-on-vestacp-centos 2016-09-15 14:45:08 +03:00
devius
8f0f83d45f mistype 2016-09-15 15:37:00 +04:00
devius
b85aa20fc3 Georgian Translation
Fully completed Georgian Language file for Vesta Control Panel
2016-09-15 15:22:15 +04:00
System Void
35092c6406 Merge pull request #838 from devius/patch-2
'Bandwidth Usage eth0'  => 'Bandwidth Usage eth0',
2016-09-13 00:29:44 +01:00
devius
18c26c825e 'Bandwidth Usage eth0' => 'Bandwidth Usage eth0',
'Bandwidth Usage eth0'  => 'Bandwidth Usage eth0', and when server has eth1, 2,3 and more interfaces, translation is missing
2016-09-13 03:16:38 +04:00
devius
d8bf2d6f9b Added missing lines
Added missing lines from en.php
Still partial translation (70%)
2016-09-12 17:41:30 +04:00
Serghey Rodin
a0458cd193 update LE agreement 2016-09-12 14:47:39 +03:00
Serghey Rodin
21f73c86a7 fix for nated ip 2016-09-12 14:41:03 +03:00
Serghey Rodin
84354fa1c1 deleting hack for nginx user / not relevant for apache 2016-09-12 13:51:31 +03:00
devius
3e7c4667bf Create ka.php
Official Georgian Language file for Vesta CP
2016-09-12 02:48:57 +04:00
Dmitry Naumov-Socolov
f1623c9bd9 fixed language key 2016-09-08 15:54:57 -04:00
naumov-socolov
4cfe03647f Merge pull request #836 from myrevery/patch-1
Update cn.php
2016-09-08 20:22:00 +03:00
myrevery
5ae9f2f2e7 Update cn.php
Perfect localization translation.
Fix some errors.
2016-09-08 10:13:10 -07:00
System Void
5faa27b5df Update README.md 2016-09-08 12:58:41 +01:00
System Void
93d0cb8740 Fixed typos 2016-09-08 12:57:30 +01:00
System Void
8b10f21172 Fixed bin
Closes #664
2016-09-08 12:16:56 +01:00
System Void
c9ce4928cb Update ISSUE_TEMPLATE.md 2016-09-08 12:12:20 +01:00
System Void
5b63d7bffd Create ISSUE_TEMPLATE.md 2016-09-08 12:10:41 +01:00
System Void
97b2a37c02 Merge pull request #833 from huloza/patch-1
Fix for cannot Save Options when Remote Backup enabled
2016-09-08 07:35:01 +01:00
huloza
90c89d8cf3 Fix for cannot Save Options when Remote Backup enabled
If Remote backup is enabled and configured and you go to Server Options you cannot save because always try to resave config without password.
2016-09-08 01:32:59 -04:00
dpeca
e1af40e232 Debian fix for spamassassin when it's not in startup list
Fix for https://bugs.vestacp.com/issues/346
2016-09-08 03:49:20 +02:00
Serghey Rodin
2057b3ee95 fix from pmamak: If locally installed package version is higher than the repo version show it as up-to-date #565 2016-09-07 16:41:35 +03:00
Dmitry Naumov-Socolov
73c6f0fd32 translated cron helper headers 2016-09-07 08:47:46 -04:00
Dmitry Naumov-Socolov
074e0be7dc added cron helper missing texts 2016-09-07 08:34:04 -04:00
Dmitry Naumov-Socolov
40d8f2c0df Merge branch 'master' of https://github.com/serghey-rodin/vesta 2016-09-07 08:24:12 -04:00
Serghey Rodin
6c7e0b70a4 Merge pull request #564 from pmamak/patch-3
Humanize mail account quota display
2016-09-07 15:20:50 +03:00
Dmitry Naumov-Socolov
250b18a50d Merge branch 'myrevery-patch-3' 2016-09-07 08:20:35 -04:00
Dmitry Naumov-Socolov
b5d850d901 added previus contributor credits 2016-09-07 08:19:36 -04:00
Dmitry Naumov-Socolov
edec2b9769 Merge branch 'patch-3' of https://github.com/myrevery/vesta into myrevery-patch-3
Conflicts:
	web/inc/i18n/cn.php
2016-09-07 08:17:11 -04:00
Serghey Rodin
9e522be38b Merge pull request #571 from Neilpang/master
add a new command v-update-web-domain-ssl, to update the ssl certificate when the certificate is renewed.
2016-09-07 14:37:38 +03:00
Serghey Rodin
5c95768cfc Merge pull request #725 from slmcncb/master
Fix cron template files
2016-09-07 14:31:38 +03:00
Serghey Rodin
26146998a6 php5-fpm config for debian 7 2016-09-07 14:21:07 +03:00
Serghey Rodin
0dd88f9244 Merge pull request #756 from Skamasle/patch-2
Fix bug 283 | Error: invalid mx_record format
2016-09-07 14:15:24 +03:00
Serghey Rodin
8b0c7b0aff Merge pull request #759 from Skamasle/patch-3
Fix Bug 287 | fail when rebuild domains whit phpfcgid or phpcgi
2016-09-07 14:14:01 +03:00
Serghey Rodin
5a8cd90f9b Merge pull request #760 from Flatta/fix-listuserlog-datetime
Fix v-list-user-log not containing TIME with JSON format
2016-09-07 14:12:55 +03:00
Serghey Rodin
4a26f72789 Merge pull request #637 from K2rool/patch-1
Stricter Permissions
2016-09-07 14:12:30 +03:00
Alexandr Loskutov
d70a936792 Исправление перевода
Исправление перевода для правильного отображения текста (подписей) в
панели
2016-09-07 09:22:20 +03:00
dpeca
7cc00677e4 Debian fix for ClamAV /var/run/clamav permission
On default Debian8 installation /var/run/clamav has wrong permissions.
ERROR: Can't save PID in file /var/run/clamav/clamd.pid
Owner was a root.
This is a fix for it.
2016-09-07 02:49:17 +02:00
naumov-socolov
f0cf68e232 Merge pull request #751 from danjol/patch-1
Update nl.php
2016-09-07 03:23:59 +03:00
Dmitry Naumov-Socolov
e2e51d0ee3 Merge branch 'ttcttctw-patch-4' 2016-09-06 20:22:27 -04:00
Dmitry Naumov-Socolov
4f46651f87 Merge branch 'patch-4' of https://github.com/ttcttctw/vesta into ttcttctw-patch-4
Conflicts:
	web/inc/i18n/tw.php
2016-09-06 20:22:02 -04:00
Dmitry Naumov-Socolov
ebe14052d2 Merge branch 'Skamasle-patch-4' 2016-09-06 19:46:14 -04:00
Dmitry Naumov-Socolov
296c5f4ea4 Merge branch 'patch-4' of https://github.com/Skamasle/vesta into Skamasle-patch-4
Conflicts:
	web/inc/i18n/es.php
2016-09-06 19:45:56 -04:00
Dmitry Naumov-Socolov
37f91ef7e0 Merge branch 'rumi55-patch-5' 2016-09-06 19:20:33 -04:00
Dmitry Naumov-Socolov
940c247c8d Merge branch 'patch-5' of https://github.com/rumi55/vesta into rumi55-patch-5
Conflicts:
	web/inc/i18n/bs.php
2016-09-06 19:20:06 -04:00
Dmitry Naumov-Socolov
7031f91ebf Merge branch 'toanalien-master' 2016-09-06 19:04:52 -04:00
Dmitry Naumov-Socolov
9231055078 Merge branch 'master' of https://github.com/toanalien/vesta into toanalien-master 2016-09-06 18:59:30 -04:00
System Void
379aae6979 Merge pull request #755 from Flatta/use-css
Use CSS rather than tricky string manipulation
2016-09-06 09:06:32 +01:00
Alexandr Loskutov
6a9ded7c99 Исправление шаблона socket
Исправление для правильной работы php-fpm с шаблоном socket
2016-09-06 09:49:01 +03:00
Alexandr Loskutov
ab94117a3e Обновление перевода
Обновление перевода до последней версии
2016-09-06 09:38:18 +03:00
Thiên Toán
aaf8106e9d Update vi.php 2016-09-06 12:38:57 +07:00
Thiên Toán
4d58f82330 Update vi.php 2016-09-06 12:38:03 +07:00
System Void
9b66c723b6 Fixed typo
Closes #444
2016-09-05 17:29:22 +01:00
System Void
29e0083f23 Merge pull request #752 from Flatta/fix-html
Remove unnecessary quotes in .html
2016-09-05 17:11:58 +01:00
Serghey Rodin
47bfb426a3 Merge pull request #508 from SysVoid/patch-5
Added file existence check.
2016-09-05 16:54:31 +03:00
Serghey Rodin
26b3b9e3f6 Merge pull request #768 from PeterDaveHello/image-optimize
optimize png images using zopflipng
2016-09-05 16:34:57 +03:00
Serghey Rodin
afd5193285 Merge pull request #826 from onbalt/master
Fix not sending "backup has been completed" mail
2016-09-05 16:31:19 +03:00
Serghey Rodin
b918f04cdc Merge pull request #827 from dpeca/patch-8
Fix for: Warning: purging the environment. Suggested action: use keep…
2016-09-05 16:30:52 +03:00
Serghey Rodin
bba62fee06 Foreground yes for clamd 2016-09-01 18:07:44 +03:00
dpeca
eaeda2e769 Fix for: Warning: purging the environment. Suggested action: use keep_environment.
Well known Exim4 issue.
Skurudo gave a solution - https://forum.vestacp.com/viewtopic.php?t=11220#p42605

And, btw, you could think about adding:
disable_ipv6=true
... because GMail and many others mail servers consider sending from ipv6 as spammy email.
(very stupid logic, but it's simply true, if you are sending from ipv6 GMail will mark it as SPAM 100%)
I'm not commiting this, I'll leave to you about this.
In this commit I'm just fixing well known issue with keep_enviroment.
2016-08-30 17:45:33 +02:00
Serghey Rodin
a563a913ed change web domain name 2016-08-30 16:50:49 +03:00
Serghey Rodin
9f551599a1 favicon update 2016-08-30 16:27:42 +03:00
Serghey Rodin
91a5d401dc fix hour var in cron listing 2016-08-30 15:24:24 +03:00
Serghey Rodin
4f3b058aba Merge branch 'master' of github.com:serghey-rodin/vesta 2016-08-30 14:49:17 +03:00
Serghey Rodin
d974b601fd Fix for backup count 2016-08-30 14:15:05 +03:00
onbalt
20e25b4648 Send "backup has been completed" mail 2016-08-30 13:00:44 +03:00
Peter Dave Hello
fa8c37559b
optimize png images using zopflipng 2016-08-30 13:05:43 +08:00
Serghey Rodin
cc91141f8d Merge pull request #792 from tjebbeke/patch-7
Improve email validation
2016-08-30 00:12:21 +03:00
Tjebbe Lievens
cd2eed6fd3 use [:alnum:] in regex 2016-08-29 20:15:34 +02:00
Serghey Rodin
2f967e4dc8 Merge pull request #825 from pcfreak30/hotfix/811
Automatically quote DNS records that have special characters BUG FIX
2016-08-29 19:38:39 +03:00
Derrick Hammer
33d795c608 *Bugfix regex and variable 2016-08-29 12:15:46 -04:00
Serghey Rodin
40790f72eb Merge pull request #763 from tigercodes/patch-1
Opencart nginx template (tpl file)
2016-08-29 19:15:30 +03:00
Serghey Rodin
f3a3c4170f Merge pull request #772 from huloza/patch-1
Add TLSA Record Type to DNS Manager
2016-08-29 19:11:25 +03:00
Serghey Rodin
14d346e730 Merge pull request #774 from dpeca/patch-2
Removing AllowSupplementaryGroups from clamav.conf
2016-08-29 19:10:42 +03:00
Serghey Rodin
4cfc45ab8b Merge pull request #776 from dpeca/patch-4
Changing password_vesta_host to server hostname
2016-08-29 19:06:37 +03:00
Serghey Rodin
7d84ff7b85 Merge pull request #777 from dpeca/patch-5
Roundcube log permission fix
2016-08-29 19:05:09 +03:00
Serghey Rodin
9773007c37 Merge pull request #778 from dpeca/patch-6
Fix for SMTP and IMAP hostname in add_mail_acc.html template
2016-08-29 19:04:29 +03:00
Serghey Rodin
ec9518f663 Merge pull request #779 from dpeca/patch-7
Fix for: /usr/local/vesta/func/db.sh: line 390: [: : integer expressi…
2016-08-29 18:07:37 +03:00
Serghey Rodin
b0a8ba921e Merge pull request #785 from pcfreak30/hotfix/784
*delete config if domain is not in user web.conf
2016-08-29 18:06:00 +03:00
Serghey Rodin
664c091e78 Merge pull request #791 from tjebbeke/patch-6
Fix user validation
2016-08-29 17:38:10 +03:00
Serghey Rodin
2a647c365b Merge pull request #794 from pcfreak30/hotfix/793
DKIM records should be absolute FQDN
2016-08-29 17:18:15 +03:00
Serghey Rodin
e715c8e827 Merge pull request #795 from pcfreak30/hotfix/771
Increase SSL key size
2016-08-29 17:17:35 +03:00
Serghey Rodin
3e7d6362a3 Merge pull request #799 from pcfreak30/hotfix/798
Use $VESTA variable everywhere in installer
2016-08-29 16:57:20 +03:00
Serghey Rodin
ce1be73afa Merge pull request #812 from pcfreak30/hotfix/811
Automatically quote DNS records that have special characters
2016-08-29 16:55:12 +03:00
Serghey Rodin
f1f1bd7ec3 Merge pull request #816 from onbalt/patch-2
Wrong variable names in v-change-web-domain- tpl
2016-08-29 16:53:54 +03:00
Serghey Rodin
9a6b406d43 Merge pull request #821 from core01/master
Fixing incorrect load of image, css and js when using HTTPS
2016-08-29 16:52:41 +03:00
Serghey Rodin
73177fe22c Merge pull request #822 from prodimon/master
mini fix
2016-08-29 16:51:57 +03:00
Serghey Rodin
6eca748bce apparmor rules for bind9 2016-08-26 17:27:02 +03:00
Serghey Rodin
7d08a3a614 replaced shell_list function 2016-08-25 19:49:15 +03:00
Serghey Rodin
742eba74b0 fix for mem chart on rhel/centos 7 2016-08-25 19:48:29 +03:00
Serghey Rodin
921f3b857f fix for database restore function 2016-08-25 19:46:07 +03:00
Serghey Rodin
19cdf5f103 check if dns-sync is already running 2016-08-25 19:45:37 +03:00
Serghey Rodin
502749a2b9 fix for password protected ssl keys 2016-08-25 19:44:12 +03:00
Serghey Rodin
1ed58a9efc ip format validator fix for cidr 2016-08-25 19:43:38 +03:00
Serghey Rodin
136cc17873 filemanager improvements 2016-08-25 19:33:06 +03:00
Serghey Rodin
03381b828f fix for bulk operations on backups 2016-08-25 19:31:23 +03:00
Serghey Rodin
dfb01cc473 fix wildcards in backup exclusion list 2016-08-25 19:30:54 +03:00
Serghey Rodin
b89f602f7b Service config feature 2016-08-25 19:29:36 +03:00
Dmitry Bannik
f1c46e9ab8 fix charset russian language to send mail 2016-08-25 02:48:13 +03:00
Dmitry Bannik
4bc53a1142 Added default install "expect" to work for backup sftp 2016-08-25 02:33:19 +03:00
core01
fad19fee73 Merge remote-tracking branch 'upstream/master' 2016-08-24 21:30:37 +03:00
core01
fdd35376f1 Fixing incorrect load of image, css and js when using HTTPS 2016-08-24 21:21:21 +03:00
onbalt
b3ccb9c9d9 Update v-change-web-domain-tpl 2016-08-20 00:10:14 +03:00
onbalt
5fd052ee07 Wrong variable in v-change-web-domain-backend-tpl
Change variable $backend to $backend_type in v-change-web-domain-backend-tpl
2016-08-19 18:25:15 +03:00
Serghey Rodin
9873dfacd0 Fix for clamav: /var/run ownership and foreground option 2016-08-18 17:22:23 +03:00
Derrick Hammer
db9be6d244 *Strip double quotes and only add back if value has spaces or semicolon 2016-08-13 17:19:55 -04:00
Derrick Hammer
b40e33165a *Define USER_DATA in loop 2016-08-13 16:29:28 -04:00
Derrick Hammer
777939b7c2 Revert "*Run main.sh for each user"
This reverts commit 715d7d600f.
2016-08-13 16:28:51 -04:00
Derrick Hammer
6016d266b2 Revert "*main.sh needs to be executed outside of loop as well"
This reverts commit 90c4d479ba.
2016-08-13 16:28:28 -04:00
Derrick Hammer
90c4d479ba *main.sh needs to be executed outside of loop as well 2016-08-13 16:25:08 -04:00
Derrick Hammer
715d7d600f *Run main.sh for each user 2016-08-13 16:21:57 -04:00
Derrick Hammer
0f5f417581 *Fix fetching users 2016-08-13 16:13:08 -04:00
Derrick Hammer
5da94dff31 *Fix usage of add_object_key 2016-08-13 15:56:24 -04:00
Derrick Hammer
cdd70c3fdc *Use double quotes to follow formatting style 2016-08-13 15:25:27 -04:00
Derrick Hammer
949576ff19 *Leave out variable sign when running add_object_key 2016-08-13 15:21:50 -04:00
Derrick Hammer
443bf67095 *Increase sign limit to 100 2016-08-13 14:23:08 -04:00
Derrick Hammer
56b57040d5 *Invert logic 2016-08-13 14:07:13 -04:00
Serghey Rodin
81a0d978fc fix for empty aliases 2016-08-10 14:40:23 +03:00
Serghey Rodin
56210b7c9e fix for missing url after login 2016-08-10 14:39:23 +03:00
Serghey Rodin
317c90b38a FileManager create archvies 2016-08-10 14:36:54 +03:00
Serghey Rodin
4adbef4517 FileManager move function + small bugfixes 2016-08-09 19:22:45 +03:00
Serghey Rodin
7b924c0227 improving kondurake patches 2016-08-09 19:21:45 +03:00
skid
98752897f0 Defining PATH for root commands 2016-08-09 17:36:36 +03:00
skid
08bdff8ba3 improving kondurake patches 2016-08-09 17:33:37 +03:00
skid
652ba9c8f6 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-08-09 16:25:42 +03:00
skid
9fb11527ba fix for domain validation on rhel5 2016-08-09 16:23:51 +03:00
Serghey Rodin
0561a213db php 5.6 for CentOS 2016-08-08 12:05:04 +03:00
Derrick Hammer
894522e77b *Update letsencrypt UI on load 2016-08-03 05:50:59 -04:00
Derrick Hammer
f1c7bafe7c *Don't error on empty ssl data if letsencrypt is on 2016-08-03 05:46:36 -04:00
Derrick Hammer
046ca885c0 *Fix typo 2016-08-03 05:31:44 -04:00
Derrick Hammer
a1d53e0489 *Fetch agreement URL from API 2016-08-03 05:08:12 -04:00
Derrick Hammer
48bced28e3 *Add letsencrypt GUI support 2016-08-03 04:00:01 -04:00
naumov-socolov
9cae6988b5 Merge pull request #803 from kondurake/patch-5
Fix "Parsing error" if a NAT IP is specified
2016-08-02 19:03:37 +03:00
naumov-socolov
6d1b5eb20f Merge pull request #801 from kondurake/patch-2
Show domain IP as "IP → NAT"
2016-08-02 18:48:56 +03:00
naumov-socolov
4375f79486 Merge pull request #802 from kondurake/patch-4
Fix "Parsing error" if a NAT IP is specified
2016-08-02 18:48:38 +03:00
kondurake
cfcc7d62a0 Fix "Parsing error" if a NAT IP is specified
https://bugs.vestacp.com/issues/325
2016-08-02 18:48:21 +03:00
kondurake
d7f4bc4a79 Fix "Parsing error" if a NAT IP is specified
https://bugs.vestacp.com/issues/325
2016-08-02 18:43:06 +03:00
kondurake
065f567a8b Show domain IP as "IP → NAT" 2016-08-02 18:37:41 +03:00
Derrick Hammer
50f1db1abf *Check for letsencrypt by the LETSENCRYPT object, not the cert metadata 2016-07-31 06:48:06 -04:00
Derrick Hammer
040f4192a7 *Add API command to disable letsencrypt for a domain 2016-07-31 06:47:08 -04:00
Derrick Hammer
b12190acba *Add LETSENCRYPT object to web config 2016-07-31 06:45:04 -04:00
Derrick Hammer
9ada699ddf *Copy/paste fail 2016-07-31 04:13:17 -04:00
Derrick Hammer
f8c8a33d40 *Set VESTA global variable and use everywhere 2016-07-31 04:06:38 -04:00
Derrick Hammer
b060bb612e *Fix key size by increasing to 4096 to be more secure and be compliant to letsencrypt 2016-07-31 03:25:21 -04:00
Derrick Hammer
721731dbd5 *Append $idn_domain to DKIM record names 2016-07-30 02:57:54 -04:00
Tjebbe Lievens
aacaf1b08f Improve email validation 2016-07-29 18:51:18 +02:00
Tjebbe Lievens
8ea7cf60d3 Fix is_format_valid 'user'
Error is showing but script isn't stopping when entering an invalid user.
2016-07-29 18:35:06 +02:00
Derrick Hammer
db4c2bcdf5 *delete config if domain is not in user web.conf 2016-07-23 15:17:12 -04:00
dpeca
5d6c0137c1 Fix for: /usr/local/vesta/func/db.sh: line 390: [: : integer expression expected
Every night cron is sending email with subject: Cron <admin@host> sudo /usr/local/vesta/bin/v-update-sys-queue disk
And content of that email is: /usr/local/vesta/func/db.sh: line 390: [: : integer expression expected

This is a fix for that bug.

I guess mysql for some databases returns empty string for DB size, so this will handle that case.
2016-07-21 02:27:51 +02:00
dpeca
c5ae7881af Fix for SMTP and IMAP hostname in add_mail_acc.html template
Dovecot and Exim4 is able to handle ONLY one TLS / SSL certs.
In most cases - it is a cert ONLY for server hostname.
So, if you point mail client to $v_domain for IMAP/SMTP TLS - mail client will popup a warning and it will say that certs are for server hostname - not for domain that client added.

So, in most cases (in 99% percents) it is better to point mail client to server hostname - because Exim4 and Dovecot have valid cert for server hostname.
2016-07-21 01:57:22 +02:00
dpeca
e2da4fbb18 Roundcube log permission fix
Roundcube is not able to write to /var/log/roundcube
This is a fix for it.

Reported as a bug long time ago - https://forum.vestacp.com/viewtopic.php?f=12&t=10114&p=39648#p38630
See last line at this post.
In v16 you accepted my pull request for password driver, but that was just a partial fix, because it needs to fix log permissions too.

Now here is a fix for roundcube log permissions.
2016-07-21 01:00:03 +02:00
dpeca
fb11b194b3 Changing password_vesta_host to server hostname
''Vesta Password Driver for Roundcube'' will try to make a HTTPS request to Vesta, in order to change mail password.
In /etc/roundcube/plugins/password/config.inc.php you have:
$rcmail_config['password_vesta_host'] = 'localhost';

That 'localhost' must be changed to server hostname, because HTTPS to localhost will not works if your server hostname is not 'localhost', because SSL certs are not for 'localhost' but for server hostname.

This line will change localhost to server hostname, and 'Vesta Password driver for Roundcube' will works.
2016-07-21 00:45:26 +02:00
dpeca
1c1ba0449c Removing AllowSupplementaryGroups from clamav.conf
Option 'AllowSupplementaryGroups' is not allowed anymore on new version of ClamAV
Reported as bug - https://bugs.vestacp.com/issues/279
Details - http://forum.vestacp.com/viewtopic.php?f=12&t=11884
2016-07-20 20:21:51 +02:00
huloza
9b7777d6fd ADD TLSA RECORD option to the DNS Manager 2016-07-20 05:52:40 -04:00
huloza
dd8a96d09d Added TLSA Record Type for DNS
sorry, i dont know the procedure for the Ideas but i created an Idea in Vesta Bug Tracker: https://bugs.vestacp.com/issues/306 

This add one more option on the Type record in DNS Manager, no need extra validation, also the file: admin/add_dns_rec.html needs to be modified to add the new option tag.
2016-07-20 05:45:40 -04:00
Serghey Rodin
e6d6e19032 # Fallback to Ubuntu 2016-07-19 14:10:45 +03:00
Serghey Rodin
b0c07020db fix for empty web domain alias 2016-07-18 22:19:27 +03:00
Serghey Rodin
fd79f3983a fix missing ns5-ns8 name servers 2016-07-18 22:19:03 +03:00
Serghey Rodin
be604d86b4 fix missing date/time 2016-07-18 22:14:56 +03:00
Serghey Rodin
3c009479c0 fix suspend/unsuspend feature 2016-07-18 20:16:22 +03:00
Serghey Rodin
430abcd0e0 fix for domain validator 2016-07-18 20:04:12 +03:00
Serghey Rodin
f5acec8c3c fixed toggle all and checkox js bug 2016-07-18 17:15:54 +03:00
Serghey Rodin
8c2a14a71f binding session to user ips for preventing session hijack 2016-07-18 16:55:33 +03:00
Serghey Rodin
83716cd533 fixed toggle all and checkox js bug 2016-07-18 16:55:02 +03:00
Serghey Rodin
6b4b81f7d6 fix default language 2016-07-18 16:54:40 +03:00
tigercodes
28942d1bd2 Opencart nginx template (tpl file)
Template to support opencart seo url's.
2016-07-11 10:14:06 -04:00
Skamasle
fd4df87ad2 Traslated new texts and features to spanish
Maybe need do more spanish traslated, one for latinoamérica and orther one for Spain
2016-07-10 23:31:14 +02:00
rumi55
d05187ca40 Update bs.php
Some updates...
2016-07-10 19:02:27 +02:00
Flat
8481061da0 Fix v-list-user-log not containing TIME with JSON format 2016-07-09 21:02:50 +09:00
Skamasle
7417899396 Update domain.sh 2016-07-09 11:52:22 +02:00
naumov-socolov
085a9e40c7 Merge pull request #757 from orwah/patch-1
Update footer.html
2016-07-07 22:30:10 +03:00
Orwah Issa
a9e2abb683 Update footer.html
keep language qutes
2016-07-07 19:30:23 +02:00
Skamasle
aff5e9066f Update main.sh 2016-07-07 15:28:20 +02:00
Flat
f175429636 Remove a duplicate element 2016-07-07 18:33:39 +09:00
Flat
497f388dcd Use white-space: nowrap; rather than replacing spaces with &nbsp;s 2016-07-07 18:31:10 +09:00
Clark Chen
ce821b1177 Update tw.php 2016-07-06 18:52:16 -04:00
Flat
755cab11db Remove unnecessary quotes 2016-07-07 07:19:41 +09:00
danjol
de44c2baaf Update nl.php
Currently translating the rest of the text :)
2016-07-06 22:11:25 +02:00
Serghey Rodin
4ad29ac76c Merge pull request #742 from mzf/master
Fix hanging processes when generate api-key
2016-07-06 13:56:27 +03:00
Serghey Rodin
99dceaa104 Merge pull request #748 from orwah/patch-5
Update ar.php
2016-07-06 13:54:51 +03:00
Serghey Rodin
d6e047a395 Merge pull request #750 from orwah/master
Update vsftpd.conf (install directory)
2016-07-06 13:54:28 +03:00
Serghey Rodin
3bed87ba15 Flatta and Diman fixes 2016-07-06 13:53:03 +03:00
Orwah Issa
eb86b95e79 Update vsftpd.conf 2016-07-06 03:29:20 +02:00
Orwah Issa
947f48fb08 Update vsftpd.conf 2016-07-06 03:19:15 +02:00
Orwah Issa
39192a7c46 Update vsftpd.conf 2016-07-06 03:18:57 +02:00
Orwah Issa
6f691bc62d Update vsftpd.conf 2016-07-06 03:18:40 +02:00
Orwah Issa
db1aa70d18 Update vsftpd.conf 2016-07-06 03:18:22 +02:00
Orwah Issa
08c4710222 Update vsftpd.conf 2016-07-06 03:17:58 +02:00
Orwah Issa
d973ea8972 Update vsftpd.conf 2016-07-06 03:17:39 +02:00
Orwah Issa
374dc9e905 Update vsftpd.conf 2016-07-06 03:17:23 +02:00
Orwah Issa
b76575bef3 Update vsftpd.conf 2016-07-06 03:17:06 +02:00
Orwah Issa
c177f164d4 Update vsftpd.conf 2016-07-06 03:16:41 +02:00
Orwah Issa
01bea04cd4 Update vsftpd.conf 2016-07-06 03:16:19 +02:00
Orwah Issa
19e54dd38f Update vsftpd.conf 2016-07-06 03:15:54 +02:00
Orwah Issa
d22a7ae902 Update ar.php
Full Translate for the newly added texts
2016-07-06 03:03:28 +02:00
Serghey Rodin
121e5a6bc9 Merge branch 'Flatta-move-js' 2016-07-05 12:14:00 +03:00
Serghey Rodin
3d27ad4fe7 Merge pull request #738 from Flatta/fix-listdbhosts-call
Fix /edit/server/ always says database unsupported
2016-07-05 12:00:08 +03:00
Serghey Rodin
b3cf2ef7e8 Merge pull request #740 from Flatta/improve-translation
Improve translation
2016-07-05 11:58:24 +03:00
Serghey Rodin
8a4b446a49 Merge pull request #743 from Flatta/fix-mail-diskusage
Fix /list/mail/ not showing disk usage
2016-07-05 11:53:23 +03:00
Flat
1fa3c4b3fb Move content of .js.html files to .html 2016-07-04 21:26:41 +09:00
Flat
61e556ae11 *.js.html: Replace CRLFs with LFs 2016-07-04 00:05:01 +09:00
Flat
fa71d33b19 Fix typo: 'U_DISKL' -> 'U_DISK' 2016-07-03 23:50:47 +09:00
mzf
2fae619bb2 Fix hanging processes when generate api-key 2016-07-03 20:16:33 +07:00
Flat
aa470ded0b Translate 'unlimited MB' bandwidth and disk quota in /list/package/ 2016-07-03 18:47:59 +09:00
Flat
604cb4ef35 Translate object types in search result 2016-07-03 18:39:07 +09:00
Flat
6328dca339 Improve Japanese Translation 2016-07-03 18:14:59 +09:00
Flat
119fc756d0 Update language files 2016-07-03 17:58:29 +09:00
Flat
dc2ff92fc4 Add missing translations to en.php 2016-07-03 17:29:29 +09:00
Flat
2bdee22e07 Translate 'Adding mail account' page 2016-07-03 17:21:18 +09:00
Flat
de43e4c884 Translate status of packages and mail accounts 2016-07-03 17:14:05 +09:00
Flat
b9e16dca06 Translate only strings 2016-07-03 16:42:09 +09:00
Flat
e76c3fd808 Translate page titles, dialog captions, 'Shortcuts', firewall actions & protocols, and list2ban chains
I think protocols and chains shouldn't be translated
2016-07-03 16:37:10 +09:00
Flat
7be9a01b8d Translate [Back] buttons, 'delete' links, 'Add one more Name Server' links 2016-07-03 16:26:19 +09:00
Flat
869c54970e Correct typo, replace 'LoadAverage' with 'Load Average' 2016-07-03 16:15:52 +09:00
Flat
dc65561391 Correct some keys of $LANG 2016-07-03 16:09:16 +09:00
Flat
6fd8787985 Don't translate those which shouldn't be translated
`those` are
- Numbers
- Already translated texts
- User names
- Network interfaces
- Package names, template names and shells
2016-07-03 15:47:24 +09:00
Flat
ed37ce4166 Merge branch 'fix-listdbhosts-call' of https://github.com/Flatta/vesta into fix-listdbhosts-call 2016-07-03 15:32:57 +09:00
Flat
e0f695e493 Fix /edit/server/ always says database unsupported
This commit changes interface of bin/v-list-database-hosts
2016-07-03 15:32:14 +09:00
Flat
6faead081b Fix /edit/server/ always says database unsupported 2016-07-03 15:09:32 +09:00
Flat
a9a7af4148 Don't translate those which shouldn't be translated
`those` are
- Numbers
- Already translated texts
- User names
- Network interfaces
2016-07-03 14:10:17 +09:00
myrevery
2cbd8e2d37 Release 0.9.8-16
Hello @serghey-rodin.
Update for 0.9.8-16
Complete and extremely accurate Chinese localization translation.
L591&L595&L597&L601 Core keywords need to be updated.
2016-07-02 08:37:35 -07:00
Flat
8b2e4da753 Forgot to delete display_error_block()s in web/templates/user/*.html 2016-07-02 21:50:16 +09:00
Flat
42dfd762d9 Move 'Logged in as' dialog to footer.html 2016-07-02 21:41:40 +09:00
Flat
37fb304942 Challenging routing on render_page 2016-07-02 21:40:46 +09:00
Flat
b1d7736612 Correct arguments passed to render_page 2016-07-02 21:04:04 +09:00
Flat
3cdc664122 Use single quotes and LFs, add semicolons 2016-07-02 20:50:34 +09:00
Flat
c57e10156e Correct indentation 2016-07-02 20:39:25 +09:00
Flat
d1b1f97ff4 Move display_error_block() to footer.html 2016-07-02 20:19:26 +09:00
Flat
e16e92278b Separate scripts from html & New rendering function 2016-07-02 19:51:56 +09:00
Serghey Rodin
656d34ed0b Fix errors when you have sub domains of the given domain 2016-07-01 14:59:29 +03:00
slmcncb
93dbc16a86 fix cron template files 2016-07-01 00:01:16 +03:00
Serghey Rodin
5c98639825 fix missing pub_ip during install 2016-06-30 23:10:03 +03:00
Serghey Rodin
de21483533 fix for multi-interface servers 2016-06-30 21:53:52 +03:00
Serghey Rodin
8c32ec4f54 css merge with u1.vestacp.com 2016-06-30 21:42:25 +03:00
Serghey Rodin
40b5aac821 Cron fix from Diman 2016-06-30 21:12:25 +03:00
Serghey Rodin
f82033f17d Merge pull request #724 from eka7a/patch-1
Update styles.min.css
2016-06-30 20:01:41 +03:00
Ekrem KAYA
ea30e9f3c3 Update styles.min.css 2016-06-30 18:55:10 +03:00
Serghey Rodin
a162fe06e8 Merge pull request #720 from Flatta/secfix-xss-pwreset
Fix XSS in Password Reset
2016-06-30 17:53:46 +03:00
Serghey Rodin
3e579eeb0a Merge pull request #718 from Metallizzer/master
Update httpd templates
2016-06-30 17:53:14 +03:00
Serghey Rodin
d12ddbc7b8 Merge pull request #712 from Flatta/trivial-css-impr
Prevent #vstobjects from hiding behind .header when there are no elements in .units
2016-06-30 17:52:27 +03:00
Flat
558643dfa5 Fix XSS in Password Reset 2016-06-30 23:12:23 +09:00
Metallizzer
a0a003423d Parameter %domain% may contain non-ASCII characters, use the %domain idn% instead, when specifying sendmail Return-Path 2016-06-30 18:29:32 +07:00
Serghey Rodin
efa101b98c Merge pull request #714 from ttcttctw/patch-3
Fix check_args on v-add-letsencrypt-domain
2016-06-30 12:52:01 +03:00
Serghey Rodin
caf1e766f6 Merge pull request #715 from slmcncb/master
Update edit_server.html and tr.php for translation
2016-06-30 12:51:27 +03:00
Serghey Rodin
521e31c73e Merge pull request #716 from insound/patch-1
Fix rebulid for web-interface
2016-06-30 12:50:38 +03:00
insound
aabbcaeb21 Fix rebulid for web-interface
Fixed this bug https://bugs.vestacp.com/issues/273
2016-06-30 13:42:11 +04:00
slmcncb
13cfbabdd7 Update tr.php 2016-06-30 00:37:28 +03:00
slmcncb
62fc1b33e2 Fix licence to license 2016-06-30 00:35:18 +03:00
Clark Chen
4208cc699d Update v-add-letsencrypt-domain 2016-06-29 17:31:05 -04:00
Flat
ff05f9cca8 Prevent .units from hiding behind .header 2016-06-30 02:50:17 +09:00
Serghey Rodin
535f286d4f Merge pull request #711 from Flatta/fix-quotes
Fix quotations in bin/v-update-user-stats
2016-06-29 19:46:41 +03:00
Flat
9f827347ad Fix quotes in bin/v-update-user-stats 2016-06-30 01:42:40 +09:00
Serghey Rodin
1af1be5af7 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-06-29 12:22:54 +03:00
Serghey Rodin
0902b1c58d fix missing local ip 2016-06-29 12:22:49 +03:00
Serghey Rodin
58092236f4 Merge pull request #710 from ttcttctw/patch-3
Update tw.php for 0.9.8-16
2016-06-29 11:43:31 +03:00
Clark Chen
cf4ce7dcc0 Update tw.php 2016-06-28 23:45:09 -04:00
Clark Chen
dbb59ca17c Update tw.php 2016-06-28 23:44:32 -04:00
Clark Chen
7a5c63f092 Update tw.php 2016-06-28 13:32:06 -04:00
Serghey Rodin
82c1c09f6d cidr ip format validator 2016-06-28 18:49:05 +03:00
Serghey Rodin
cc4e053148 config parser fix 2016-06-28 17:47:49 +03:00
Serghey Rodin
047be8108c fix for missing ip in install header 2016-06-28 16:54:56 +03:00
Serghey Rodin
b9c29b20bd fix for banlist deletion 2016-06-28 16:18:17 +03:00
Serghey Rodin
48cf929e22 domain idn handler 2016-06-28 15:38:11 +03:00
Serghey Rodin
9aaa2aa032 proper delimiter for name servers 2016-06-28 15:07:37 +03:00
Serghey Rodin
155573ac88 fix for missing hostname 2016-06-28 14:55:59 +03:00
Serghey Rodin
859798cb34 hotfixes for css and domain deletion 2016-06-28 14:39:11 +03:00
Serghey Rodin
637fac7bfe session fix for new installers 2016-06-28 13:49:17 +03:00
Serghey Rodin
17c20881e1 autoupdates + fqdn workaround 2016-06-28 02:46:10 +03:00
Serghey Rodin
29fc164954 fix restart argument shifting 2016-06-28 02:26:07 +03:00
Serghey Rodin
1bb57ecf63 changed validator for dbhost 2016-06-28 01:41:59 +03:00
Serghey Rodin
66b9f32139 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-06-27 20:29:22 +03:00
Serghey Rodin
2788426567 delete old notifications 2016-06-27 20:29:09 +03:00
Serghey Rodin
5f4f05386f delete old notifications 2016-06-27 19:50:36 +03:00
Serghey Rodin
b787f11635 css style fixes 2016-06-27 19:41:07 +03:00
Serghey Rodin
1d279ecf45 Merge pull request #572 from cdnmall/patch-2
Fix css issue for forgot password page.
2016-06-27 15:44:30 +03:00
Serghey Rodin
9533f1c158 Merge pull request #706 from Flatta/translate-ja
Improved Japanese translation
2016-06-27 15:43:32 +03:00
Serghey Rodin
2e4709494f Merge pull request #707 from Flatta/correct-title
Correct page title of /list/server/?disk and /list/server/?net
2016-06-27 15:31:51 +03:00
Flat
fed6815c64 Correct page title of /list/server/?disk and /list/server/?net 2016-06-27 21:29:11 +09:00
Flat
59fd9555a4 Improve Japanese translation 2016-06-27 21:21:12 +09:00
Serghey Rodin
0ce0083fb7 wrong release date 2016-06-27 15:05:36 +03:00
Serghey Rodin
0b58fefaee wrong release date 2016-06-27 14:46:59 +03:00
Serghey Rodin
09a579cd88 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-06-27 14:33:00 +03:00
Serghey Rodin
c59b6230a2 Release 0.9.8-16 2016-06-27 14:31:44 +03:00
Serghey Rodin
2daeadc856 Merge pull request #705 from slmcncb/master
Update tr.php
2016-06-27 13:10:10 +03:00
slmcncb
75b18551c5 Update tr.php 2016-06-27 12:49:36 +03:00
slmcncb
b1f2f7ca86 Update tr.php 2016-06-27 12:36:14 +03:00
Serghey Rodin
e49317b9d0 Merge branch 'ttcttctw-master' 2016-06-27 12:09:07 +03:00
Serghey Rodin
a9d8332565 manually mergin PR #551 2016-06-27 12:08:55 +03:00
Serghey Rodin
b2771bb8b2 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-06-27 11:49:50 +03:00
Serghey Rodin
243887e3e3 Merge branch 'MarPiRK-master' 2016-06-27 11:49:12 +03:00
Serghey Rodin
f753213d0c manually mergin PR #568 2016-06-27 11:49:02 +03:00
Serghey Rodin
447577be0b Merge pull request #584 from alex-connor/patch-5
Update ru.php
2016-06-27 11:46:52 +03:00
Serghey Rodin
0c18d30ff1 Merge branch 'Spheerys-master' 2016-06-27 11:45:45 +03:00
Serghey Rodin
6138778706 manually mergin PR #623 2016-06-27 11:45:34 +03:00
Serghey Rodin
f9d1982517 Merge branch 'rumi55-patch-4' 2016-06-27 11:43:43 +03:00
Serghey Rodin
d21a57f43a manually mergin PR #676 2016-06-27 11:43:33 +03:00
Serghey Rodin
014ee04bca Merge branch 'azuya-patch-1' 2016-06-27 11:42:07 +03:00
Serghey Rodin
5da19f4f2d manually mergin PR #689 2016-06-27 11:41:55 +03:00
Serghey Rodin
e9990633f0 Merge pull request #704 from orwah/patch-4
Update vsftpd.conf
2016-06-27 11:33:56 +03:00
Serghey Rodin
a4c0e13065 Merge pull request #627 from n1trux/master
fix dokuwiki nginx template
2016-06-27 11:32:40 +03:00
phre4k
3f314d19bd Revert "added check for web server type in SSL config, closes #626"
This reverts commit d2e01fab76.
2016-06-27 09:37:56 +02:00
Orwah Issa
53cd231148 Update vsftpd.conf
better for security:
using 022 for local_umask and anon_umask is better than 002 ,
it will create default 755 folders and 644 files (instead of 775) :
777 - 775 = 002 
777 - 755 = 022

i think it's better to change in all vsftpd.conf files (all in install folder)
regards
2016-06-27 07:03:34 +02:00
Orwah Issa
6ddf29a3ad Merge pull request #1 from orwah/orwah-vsftpd.conf-1
Update vsftpd.conf
2016-06-27 07:00:02 +02:00
Orwah Issa
937919439a Update vsftpd.conf
better for security
using 022 for local_umask and anon_umask is better than 002 ,
it will create default 755 folders and 644 files (instead of 775) :
777 - 775 = 002 
777 - 755 = 022

i think this must change in all vsftpd.conf files in install folder
regards
2016-06-27 06:18:45 +02:00
Serghey Rodin
745769dab8 Merge pull request #612 from teryanik/master
Fix bug with "user already exists"
2016-06-27 02:17:53 +03:00
Serghey Rodin
bfb6b73368 Merge pull request #559 from skurudo/master
Farsi/Persian language file
2016-06-27 02:15:08 +03:00
Serghey Rodin
972c82ae6b Merge pull request #561 from cdnmall/cdnmall-patch-1
Open TCP port 53 for dns
2016-06-27 02:13:32 +03:00
Serghey Rodin
9ec4e8b32a Merge pull request #549 from amiri27/master
Added use_localtime attribute to vsftpd
2016-06-27 02:12:57 +03:00
Serghey Rodin
5748549de5 Merge pull request #588 from alex-connor/patch-6
Update nginx.conf
2016-06-27 02:12:14 +03:00
Serghey Rodin
e2179291c4 Merge pull request #589 from alex-connor/patch-7
Update nginx.conf
2016-06-27 02:12:06 +03:00
Serghey Rodin
7d087c8d4c Merge pull request #590 from alex-connor/patch-8
Update nginx.conf
2016-06-27 02:11:54 +03:00
Serghey Rodin
51c15d0d69 Merge pull request #591 from alex-connor/patch-9
Update nginx.conf
2016-06-27 02:11:24 +03:00
Serghey Rodin
64c8a2997b Merge pull request #592 from alex-connor/patch-10
Update nginx.conf
2016-06-27 02:10:58 +03:00
Serghey Rodin
b19eabeda8 Merge pull request #593 from alex-connor/patch-11
Update nginx.conf
2016-06-27 02:10:48 +03:00
Serghey Rodin
e1083a9060 Merge pull request #594 from alex-connor/patch-12
Update nginx.conf
2016-06-27 02:10:37 +03:00
Serghey Rodin
a0946b19e9 Merge pull request #595 from alex-connor/patch-13
Update nginx.conf
2016-06-27 02:10:26 +03:00
Serghey Rodin
74db33a7be Merge pull request #596 from alex-connor/patch-14
Update nginx.conf
2016-06-27 02:10:14 +03:00
Serghey Rodin
c0bec6b7e1 Merge pull request #597 from alex-connor/patch-15
Update nginx.conf
2016-06-27 02:10:00 +03:00
Serghey Rodin
c1a311f73b Merge pull request #598 from alex-connor/patch-16
Update nginx.conf
2016-06-27 02:09:52 +03:00
Serghey Rodin
99d0a8cf92 Merge pull request #599 from alex-connor/patch-17
Update nginx.conf
2016-06-27 02:09:40 +03:00
Serghey Rodin
f59044b3ee Merge pull request #600 from alex-connor/patch-18
Update nginx.conf
2016-06-27 02:09:08 +03:00
Serghey Rodin
fb1e7aa43f Merge pull request #621 from atonit/update-exim-to-exim4
updated exim to exim4 directory in localuser_fwd_only debian ubuntu
2016-06-27 02:05:03 +03:00
Serghey Rodin
0100238290 Merge pull request #608 from cdnmall/patch-10
Fixed incorrect variables for PostgreSQL Support
2016-06-27 02:01:52 +03:00
Serghey Rodin
c9e586d9eb Merge pull request #619 from dpeca/patch-1
Update for Roundcube Password driver for Vesta
2016-06-27 02:00:49 +03:00
Serghey Rodin
9f0073a3b2 Merge pull request #631 from crackerizer/master
Added Drupal 6,7 and Moodle Nginx's templates
2016-06-27 01:59:45 +03:00
Serghey Rodin
18b40f3e05 Merge branch 'orwah-patch-1' 2016-06-27 01:55:00 +03:00
Serghey Rodin
16cc292b01 manually merged PR #643 2016-06-27 01:54:44 +03:00
Serghey Rodin
bc6bc8dd10 Merge branch 'SysVoid-patch-13' 2016-06-27 01:49:37 +03:00
Serghey Rodin
8fe64c00fe manually merged PR #653 2016-06-27 01:48:34 +03:00
Serghey Rodin
9e2107699e Merge branch 'master' of github.com:serghey-rodin/vesta 2016-06-27 01:39:43 +03:00
Serghey Rodin
4b8a2c3f38 fixes from u1 (default login + i18n) 2016-06-27 01:39:34 +03:00
Serghey Rodin
5edfe8dd32 fix LE - JSON pretty 2016-06-27 01:38:01 +03:00
Serghey Rodin
f197bc8041 fix for userlist 2016-06-27 01:37:10 +03:00
Serghey Rodin
d55c32eae5 Merge pull request #658 from Scorcher/fix-firewall-hole-2
Fix hole in iptables: connect to any ports from defined in rules ports.
2016-06-27 01:23:38 +03:00
Serghey Rodin
4804d8c5e7 Merge pull request #703 from Flatta/remove-redundant-quotes
Remove redundant quotes in .html files
2016-06-27 01:21:08 +03:00
System Void
20675ac380 Added file check 2016-06-26 16:18:43 +01:00
System Void
af66851b8b Moving this to v-open-fs-file 2016-06-26 16:14:47 +01:00
Flat
c23924e987 Remove redundant quotes in .html files 2016-06-26 20:58:20 +09:00
Serghey Rodin
c436f0791a Merge pull request #671 from core01/master
MODX nginx templates added
2016-06-25 11:35:32 +03:00
Serghey Rodin
35237b90f6 Merge pull request #672 from nguyenngocphuongnb/patch-1
Correct wrong spelling
2016-06-25 11:35:09 +03:00
Serghey Rodin
407f72fae1 Merge pull request #673 from ibarrajo/master
Fixing exim auto reply bug for ubuntu and debian as stated in issue #198
2016-06-25 11:34:20 +03:00
Serghey Rodin
04764b8c0a Merge pull request #674 from romones/master
Fixing exim auto reply bug for rhel as stated in issue #198
2016-06-25 11:33:20 +03:00
Serghey Rodin
62791f86ed Merge pull request #682 from geneanet/feat-des-passwords
Handle Crypt (DES) passwords
2016-06-25 11:30:16 +03:00
Serghey Rodin
1db2592831 Merge pull request #683 from Neilpang/master
make path first, in case the part doesn't exist.
2016-06-25 11:29:07 +03:00
Serghey Rodin
c6249faf6c Merge pull request #684 from MartinRaiola/patch-1
Fix OS version in vst-install-debian.sh
2016-06-25 11:28:30 +03:00
Serghey Rodin
e106fee8d2 Merge pull request #687 from olshek/patch-1
improved regular expression in v-backup-user file
2016-06-25 11:20:45 +03:00
Serghey Rodin
034b2cf094 Merge pull request #690 from azuya/patch-3
Update edit_package.html
2016-06-25 11:19:30 +03:00
Serghey Rodin
ff7d48bf66 Merge pull request #691 from runelaenen/patch-1
Fix wrong documentation
2016-06-25 11:17:21 +03:00
Serghey Rodin
a9da33e85b Merge pull request #696 from martijnded/master
no-php.tpl # comment replaced with ; comment
2016-06-25 11:14:37 +03:00
Serghey Rodin
095a9f14ee backup validation fix 2016-06-25 11:09:44 +03:00
Serghey Rodin
e83c5c0043 domain validation fix 2016-06-25 11:09:29 +03:00
Serghey Rodin
d30f9d1000 get user ip fix 2016-06-25 11:08:19 +03:00
Serghey Rodin
516b54fe3f is_domain_new fix 2016-06-25 11:07:45 +03:00
Serghey Rodin
704bf770f7 resolving repo conflicts 2016-06-25 11:07:06 +03:00
Serghey Rodin
5babb1c55f fix argument shift 2016-06-24 18:06:15 +03:00
Serghey Rodin
d8e6411e94 fallback for missing backend template 2016-06-24 18:04:35 +03:00
Serghey Rodin
b67632d578 check_result() refactoring 2016-06-24 18:04:16 +03:00
Serghey Rodin
ebc53f6129 swapped format validators 2016-06-24 18:03:54 +03:00
Serghey Rodin
f9d02fce88 list-database-hosts refactoring 2016-06-24 18:02:48 +03:00
Serghey Rodin
3525b46205 FileManager css update 2016-06-24 17:43:54 +03:00
Serghey Rodin
26867cfbe6 nameservers separated by comma 2016-06-24 17:40:50 +03:00
Serghey Rodin
2a59a0986f flat icon update 2016-06-24 17:38:23 +03:00
Serghey Rodin
b62aba465b array syntax fix 2016-06-24 17:38:08 +03:00
Serghey Rodin
3bd2d0a654 css styling 2016-06-24 17:37:06 +03:00
Serghey Rodin
5dd7a38a96 file permission 2016-06-24 17:36:46 +03:00
Serghey Rodin
35f7b8a869 no session_start() 2016-06-24 17:36:23 +03:00
Serghey Rodin
dfb4ca421a cron helper language update 2016-06-24 16:40:13 +03:00
Serghey Rodin
7b93d36712 css style update 2016-06-24 16:38:32 +03:00
Serghey Rodin
07b93358e8 notify option ssupport 2016-06-24 16:38:08 +03:00
Serghey Rodin
027290225b relative path support 2016-06-24 16:37:41 +03:00
Serghey Rodin
7fefa20d90 FileManager bugfixes + file permission module 2016-06-24 16:36:59 +03:00
Serghey Rodin
ffec2e7e2d refactoring update web templates 2016-06-24 16:35:51 +03:00
Serghey Rodin
5d30b67fb1 refactoring: log_event(), is_format_valid() 2016-06-24 16:33:24 +03:00
Serghey Rodin
d4f30b570b New session.save_path location 2016-06-24 16:32:55 +03:00
Serghey Rodin
a61a6e979e refactoring: log_event(), is_format_valid() 2016-06-24 16:31:43 +03:00
Serghey Rodin
325ca65f32 web function refactoring 2016-06-09 17:09:55 +03:00
Serghey Rodin
8b237eb936 web function refactoring 2016-06-09 17:09:25 +03:00
Serghey Rodin
6168985b98 web function refactoring 2016-06-09 17:08:34 +03:00
Serghey Rodin
72eddc3319 web function refactoring 2016-06-09 17:08:07 +03:00
Serghey Rodin
41eb0d81c4 LetsEncrypt core API support 2016-06-09 17:07:15 +03:00
Serghey Rodin
872cd3ac45 web function refactoring 2016-06-09 17:05:41 +03:00
Serghey Rodin
73b63016d4 sftp chroot hotfixes 2016-06-09 17:04:18 +03:00
Serghey Rodin
c8d45ed139 ip functions refactoring 2016-06-09 17:02:29 +03:00
Serghey Rodin
e05dca61a6 refactoring: log_event(), is_format_valid() 2016-06-09 16:55:35 +03:00
Serghey Rodin
6e0ef668bb listing scripts refactoring + new format 2016-06-09 16:26:54 +03:00
Serghey Rodin
b7e9f4b5b0 deleted redundand scripts 2016-06-09 16:25:15 +03:00
martijndedood
6dcfc8a3dc no-php.tpl # comment replaced with ; comment 2016-05-31 21:45:38 +02:00
Rune Laenen
3018652707 Fix wrong documentation 2016-05-08 14:52:08 +02:00
Disketsa - Azuya
449fd97644 Update edit_package.html
After save the package, back button link is referer to https://dimain/list/package/?package={package_name}
i think we dont need this. Back button will alway go to /list/package/ .... 
 CMIIW ....
2016-05-08 14:19:20 +07:00
Disketsa - Azuya
64784e326d Fix id.php translation 2016-05-08 13:56:22 +07:00
olshek
170bd64ec2 improved regular expression in v-backup-user file
The regular expression now uses exact match of a folder/file name.
With the previous version, some files were ignored during the backup process(for example .gitconfig, because it contains "conf").
2016-05-04 14:13:36 +03:00
MartinG
9f1ea16dc8 Update vst-install-debian.sh 2016-04-29 04:11:14 +02:00
neil
3bf6a399a5 make path first, in case the part doesn't exist.
make path first, in case the part doesn't exist.
2016-04-26 23:12:35 +08:00
Hervé BRY
ea22b393ca Handle DES passwords 2016-04-22 16:37:59 +02:00
rumi55
bbcf9dceb7 Update bs.php
Some changes ... More coming soon.
2016-04-03 18:12:03 +02:00
Roman Florea
a13bcf5322 Fixing exim auto reply bug for rhel as stated in issue #198 2016-04-02 22:57:45 +03:00
Josue Alexander Ibarra
19bf969b84 Fixing exim auto reply bug for ubuntu and debian as stated in issue #198 2016-04-02 11:59:29 -07:00
Nguyen Ngoc Phuong
f0af705f92 Correct wrong spelling 2016-04-01 00:41:12 +07:00
Roman Sadoyan
9c655bfcf3 MODX nginx template added 2016-03-26 14:13:15 +03:00
Clark Chen
79cf515b93 Merge remote-tracking branch 'origin/master' 2016-03-24 00:37:39 -04:00
Clark Chen
66c9e56e46 Merge remote-tracking branch 'serghey-rodin/master' 2016-03-24 00:37:34 -04:00
Scorcher
969ca7e15b Fix hole in iptables: connect to any ports from defined in rules ports. 2016-02-28 15:58:53 +05:00
Phinitnan Chanasabaeng
1c3aaa013b Added Nginx's Drupal 8 templates 2016-02-25 20:55:37 +07:00
System Void
8b18ca3c9d Fixed NGINX/Named Status Sharing Issue
Closes #636
2016-02-25 02:42:21 +00:00
Phinitnan Chanasabaeng
81ae01099d Fixed Owncloud NGINX template causes redirect loop. 2016-02-22 14:28:51 +07:00
Phinitnan Chanasabaeng
9218cf64d3 Merge branch 'master' of https://github.com/serghey-rodin/vesta 2016-02-22 14:23:24 +07:00
Serghey Rodin
5e861eb78f Merge pull request #639 from tjebbeke/patch-3
#638 quick fix
2016-02-19 18:22:46 +02:00
Orwah Issa
fc5a07bf0f Update ar.php
Complete the Arabic Translation file (improved)
2016-02-19 17:59:45 +02:00
phre4k
663c4dd301 change dokuwiki template to execute php files in lib/exe 2016-02-19 14:57:36 +01:00
Tjebbe Lievens
1eb52371bb #638 quick fix
quick fix for issue #638, maybe check on other places where this is possible?
2016-02-19 12:53:30 +01:00
Ryan Harvey
395c471021 Update v-add-user
More stricter permissions, the current setup allows any user on the system to read other users web files as long as they know the path, the only users which should  be allow to access $HOMEDIR/$user/web is owner of sites and nginx user to be able to serve static files.

 I also locked down access $HOMEDIR/$user/tmp to the user, its gets used in the hosting template for tmp files, i don't see why another user would need access to it as apache runs as the user.
2016-02-18 02:12:53 +00:00
dpeca
6fbc433a52 SSL fix for roundcube/plugins/password/drivers/vesta.php
Fix that will allow vesta driver to comunicate with VestaCP even there are self signed SSL cert.
Previously fsockopen failed to connect on self-signed SSL cert.
2016-02-14 17:51:16 +01:00
Phinitnan Chanasabaeng
6de8aaa2e9 Added Nginx's Moodle templates 2016-02-13 16:55:47 +07:00
Phinitnan Chanasabaeng
975543788d Delete old Nginx's Drupal template 2016-02-13 15:43:13 +07:00
Phinitnan Chanasabaeng
cf532e0ee3 Separates nginx's Drupal 6 & 7 template 2016-02-13 15:40:34 +07:00
Clark Chen
64068699c0 Update tw.php 2016-02-12 13:37:43 -05:00
phre4k
d2e01fab76 added check for web server type in SSL config, closes #626 2016-02-09 22:30:42 +01:00
Hedy Dargère
e58e36ce78 More terms translated in french 2016-02-04 23:52:48 +01:00
atonit
7d2b34193f updated exim to exim4 directory in localuser_fwd_only debian ubuntu 2016-01-31 16:48:24 +00:00
dpeca
f95af89939 Update vesta.php
New version of roundcube 'password' plugin is expecting class instead of function.
2016-01-31 03:47:30 +01:00
teryanik
ec7994a402 Fix bug with "user already exists" 2016-01-20 11:03:49 +03:00
Joe Mattos
3b2f499e7f Fixed incorrect variables for PostgreSQL Support 2016-01-15 06:06:05 -05:00
Olexandr Loskutov
9f127afa1f Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:56:01 +02:00
Olexandr Loskutov
42f8d4dacd Update nginx.conf
Add more gzip_types 
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:55:18 +02:00
Olexandr Loskutov
e956cdf1db Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:54:23 +02:00
Olexandr Loskutov
cdfca212e8 Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:53:39 +02:00
Olexandr Loskutov
7bc7c44931 Update nginx.conf
Add more gzip_types https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:52:39 +02:00
Olexandr Loskutov
115a7afa6a Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:51:39 +02:00
Olexandr Loskutov
ffde0fd730 Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:50:46 +02:00
Olexandr Loskutov
50d1484a7c Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:49:46 +02:00
Olexandr Loskutov
576e50c2c9 Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:48:11 +02:00
Olexandr Loskutov
1a0387b183 Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:47:16 +02:00
Olexandr Loskutov
62d337e87d Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:46:30 +02:00
Olexandr Loskutov
e2a7eb0113 Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:45:29 +02:00
Olexandr Loskutov
14cd546222 Update nginx.conf
Add more gzip_types
https://forum.vestacp.com/viewtopic.php?f=29&t=5100#p20750
2016-01-13 00:44:06 +02:00
Olexandr Loskutov
aa16839ead Update ru.php 2016-01-09 23:24:53 +02:00
Clark Chen
a1ebeedd58 Update tw.php 2016-01-07 11:50:59 -05:00
Clark Chen
94e439b5d7 Update i18n.php 2016-01-07 11:50:32 -05:00
Clark Chen
7fbeb1ef3c Update i18n.php 2016-01-07 11:48:24 -05:00
Joe M
6306461a7d Fix css issue for forgot password page. 2015-12-29 07:39:36 -05:00
neil
50b304464f add new command v-update-web-domain-ssl, to update the ssl certificate when the certificate is renewed. 2015-12-29 14:02:53 +08:00
neil
3d419795b0 Merge branch 'master' of https://github.com/Neilpang/vesta 2015-12-29 13:44:31 +08:00
Neil
4986865b98 Merge pull request #1 from serghey-rodin/master
sync
2015-12-29 13:43:13 +08:00
MarPiRK
2abad2edf0 Updated Polish translation 2015-12-28 22:20:24 +01:00
Clark Chen
a4be1eb035 update tw.php 2015-12-28 10:12:02 -05:00
Clark Chen
8b90f99d03 Merge remote-tracking branch 'serghey-rodin/master'
# Conflicts:
#	web/inc/i18n/tw.php
2015-12-28 10:10:03 -05:00
Malishev Dmitry
1689ea34a2 added html tags escaping 2015-12-28 15:23:53 +01:00
Joe M
431e805e29 Open TCP port 53 for dns 2015-12-28 05:44:27 -05:00
Joe M
8d8dca8168 Open TCP port 53 for dns 2015-12-28 05:43:23 -05:00
Joe M
b78f41c1a7 Open TCP port 53 for dns 2015-12-28 05:40:11 -05:00
Joe M
db10790d82 Open TCP port 53 for dns 2015-12-28 05:39:43 -05:00
Joe M
20c9b83e71 Open TCP port 53 for dns 2015-12-28 05:39:10 -05:00
Joe M
6d1dd2a01c Open TCP port 53 for dns 2015-12-28 05:38:30 -05:00
Joe M
176ab61ef4 Open TCP port 53 for dns 2015-12-28 05:38:05 -05:00
Joe M
7654b21e4c Open TCP port 53 for dns 2015-12-28 05:37:37 -05:00
Joe M
f8b449f124 Open TCP port 53 for dns 2015-12-28 05:37:16 -05:00
Joe M
82c335a9fc Open TCP port 53 for dns 2015-12-28 05:36:55 -05:00
Joe M
9efd4211fd Open TCP port 53 for dns 2015-12-28 05:36:29 -05:00
Joe M
cbfcbe837f Open TCP port 53 for dns 2015-12-28 05:35:53 -05:00
Joe M
b00bf0e43c Open TCP port 53 for dns 2015-12-28 05:35:08 -05:00
Joe M
7991da6259 Open TCP port 53 for dns 2015-12-28 05:34:36 -05:00
Joe M
d30504856a Open TCP port 53 for dns 2015-12-28 05:34:08 -05:00
Joe M
368d4b0069 Open TCP port 53 for dns 2015-12-28 05:33:40 -05:00
Joe M
9db2e8acf2 Open TCP port 53 for dns 2015-12-28 05:33:11 -05:00
Joe M
97a86e4da6 Open TCP port 53 for dns 2015-12-28 05:32:47 -05:00
Joe M
2d3aa5622a Open TCP port 53 for dns 2015-12-28 05:32:18 -05:00
Joe M
113aefcf73 Open TCP port 53 for dns 2015-12-28 05:31:42 -05:00
Joe M
8fd120435f Open TCP port 53 for dns 2015-12-28 05:31:03 -05:00
Joe M
5c627c6b99 Open TCP port 53 for dns 2015-12-28 05:30:11 -05:00
Joe M
2b4543b85e Open TCP port 53 for dns 2015-12-28 05:29:27 -05:00
Joe M
421a6b2400 Open TCP port 53 for dns 2015-12-28 05:28:53 -05:00
Joe M
1c24b05a1e Open TCP port 53 for dns 2015-12-28 05:28:25 -05:00
Joe M
ce18377ad9 Update rules.conf 2015-12-28 05:26:46 -05:00
Joe M
46f2fbb471 Open TCP port 53 for dns 2015-12-28 05:25:20 -05:00
Joe M
1d10dbdc4d Open TCP port 53 for dns 2015-12-28 05:24:40 -05:00
Joe M
2df042d408 Open TCP port 53 for dns 2015-12-28 05:24:02 -05:00
Joe M
806e274384 Open TCP port 53 for dns 2015-12-28 05:22:01 -05:00
Pavel Galkin
49c26edc0a Farsi/Persian language file
Farsi/Persian language file
2015-12-26 22:53:12 +03:00
Piotr Mamak
539a248a50 Humanize mail account quota (user) 2015-12-25 19:46:07 +01:00
Piotr Mamak
f9dc923343 Humanize mail account quota 2015-12-25 19:43:08 +01:00
Clark Chen
b557ba4576 Update tw.php 2015-12-25 10:23:19 -05:00
Clark Chen
b5838322fe Update tw.php 2015-12-25 09:08:11 -05:00
Clark Chen
337a5924a3 Update tw.php
Add miss translated string "Path"
2015-12-23 06:03:12 -05:00
Clark Chen
ce0cabf9aa 12/18/2015 - Minor edit 2015-12-18 17:51:59 -05:00
Clark Chen
73fc463bd3 Update for Vesta 0.9.8-15 2015-12-17 14:55:53 -05:00
Mostafa Amiri
f95e299521 Added use_localtime attribute to vsftpd
By adding this attribute users will get files listing by their local
timezone
2015-12-17 20:40:37 +03:30
Serghey Rodin
d3a7c6fac7 Merge pull request #545 from SysVoid/patch-8
Fix Undefined Var & Require $_POST['cmd'].
2015-12-17 16:00:02 +02:00
Serghey Rodin
1acfa60a55 Merge pull request #544 from lcdss/master
update portuguese (Portugal) and add portuguese (Brazil) language files
2015-12-17 15:53:39 +02:00
Serghey Rodin
94741d5345 Merge pull request #540 from myrevery/patch-2
Update cn.php
2015-12-17 15:52:21 +02:00
Serghey Rodin
976756f85a Merge pull request #547 from ionescu-bogdan/patch-6
Update ro.php
2015-12-17 15:50:21 +02:00
Ionescu Bogdan
64e99d3f82 Update ro.php
Small changes.
2015-12-15 17:59:32 +02:00
System Void
e9c35aacaf Fix Undefined Var & Require $_POST['cmd'].
I fixed an undefined variable in my past commit, and also enabled the requirement for the `cmd` POST field.
2015-12-14 16:35:39 +00:00
Lucas C. S. Silva
4a3cf9709a update portuguese (Portugal) and add portuguese (Brazil) language files 2015-12-13 23:24:07 -02:00
myrevery
be109c946c Update cn.php
Hello @serghey-rodin.
Update:
  1. L155 -- Add keywords that are missing. (Comparative en are missing)
  2. L199-202 -- Replaced by a more accurate translation.

In addition, in here I explained cn and en differences: https://github.com/serghey-rodin/vesta/pull/514#issuecomment-164104751
2015-12-13 15:31:40 +08:00
Serghey Rodin
332ef2797e Merge pull request #535 from SysVoid/patch-7
[HIGH PRIORITY] Forgot to escape command arguments
2015-12-11 22:44:55 +02:00
System Void
fc0e7ba28b Forgot to escape that
Whoopsies
2015-12-11 20:09:19 +00:00
Serghey Rodin
df0d6c12cb Merge pull request #482 from RhysIT/master
Corrected spelling mistakes
2015-12-11 22:00:26 +02:00
Serghey Rodin
88dbea2e87 Merge pull request #492 from cdnmall/patch-5
Duplicate session_start
2015-12-11 21:56:49 +02:00
Serghey Rodin
6f24fe32d0 Merge pull request #493 from cdnmall/patch-4
Duplicate session_start
2015-12-11 21:55:54 +02:00
Serghey Rodin
747c79d649 Merge pull request #507 from SysVoid/patch-4
+backup directory check, -closing PHP tag.
2015-12-11 21:55:16 +02:00
Serghey Rodin
bca6e7f130 Merge pull request #490 from skurudo/master
TW translation fix
2015-12-11 21:48:57 +02:00
Serghey Rodin
4dce22cd77 Merge pull request #506 from Flatta/fix-sec-backup
Fix #505: Strict backup filename check.
2015-12-11 21:48:23 +02:00
Serghey Rodin
9baea195fd Merge pull request #509 from SysVoid/patch-6
Allow Unlimited Arguments in API
2015-12-11 21:47:40 +02:00
Serghey Rodin
95850df8d1 Flatta's security fixes from PullRequest #516 2015-12-11 21:32:07 +02:00
Serghey Rodin
f8b39ecae7 Merge pull request #534 from serghey-rodin/revert-516-fix-sec-osci
Revert "[SECURITY] Fix OS command injection."
2015-12-11 21:15:05 +02:00
Serghey Rodin
39e9b6397b Revert "[SECURITY] Fix OS command injection." 2015-12-11 21:14:49 +02:00
Serghey Rodin
9620bfbf35 Merge pull request #516 from Flatta/fix-sec-osci
[SECURITY] Fix OS command injection.
2015-12-11 21:11:14 +02:00
Serghey Rodin
070a62b05d Merge pull request #517 from ionescu-bogdan/patch-1
Sys quota - Patch 1
2015-12-11 20:50:54 +02:00
Serghey Rodin
49a18fbdf8 Merge pull request #514 from myrevery/patch-1
Replace cn.php
2015-12-11 20:13:38 +02:00
Serghey Rodin
c768f01088 Merge pull request #518 from alex-connor/patch-3
Update vst-install-rhel.sh
2015-12-11 20:13:17 +02:00
Serghey Rodin
73fb45407e Merge pull request #520 from alex-connor/patch-4
Update ua.php
2015-12-11 20:02:53 +02:00
Serghey Rodin
edc490fc6e Merge pull request #525 from ionescu-bogdan/patch-5
Update templates for translation
2015-12-11 20:02:42 +02:00
Serghey Rodin
2b532e6aac Merge pull request #523 from ionescu-bogdan/patch-2
Update ro.php
2015-12-11 19:49:08 +02:00
Serghey Rodin
dbbdbc0540 Merge pull request #524 from ionescu-bogdan/patch-3
Update en.php
2015-12-11 19:48:10 +02:00
Serghey Rodin
b4a31a77b2 Merge pull request #528 from Caelish/master
Fixed typos in suspended page for Ubuntu & Debian; made identical to the RHEL one
2015-12-11 19:42:59 +02:00
Serghey Rodin
3655d2ea7b Merge pull request #529 from Lednerb/patch-1
Fixed License link in README.md
2015-12-11 19:42:32 +02:00
Serghey Rodin
39ab7f3631 Merge pull request #533 from ionescu-bogdan/patch-4
Update v-list-web-templates
2015-12-11 19:42:01 +02:00
Serghey Rodin
cd0dbb4671 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-12-11 18:58:33 +02:00
Serghey Rodin
0b48a049eb keboard navigation support 2015-12-11 18:58:20 +02:00
Ionescu Bogdan
73f0b69372 Update v-list-web-templates
1. Custom web template whith dot:
- php-5.5-fcgid
- php-5.6-fcgid
...

2. natural sort of numbers within text
2015-12-08 02:49:59 +02:00
Sascha Brendel
5ce656f549 Fixed License link 2015-12-07 09:08:27 +01:00
Caelish
9ccbf28203 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:45:07 +01:00
Caelish
ff7d2b04e9 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:44:46 +01:00
Caelish
1330680a3b Fixed typos and made identical to RHEL version of this page 2015-12-06 14:44:21 +01:00
Caelish
b8dee0e593 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:43:58 +01:00
Caelish
2739fcd6f1 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:43:26 +01:00
Caelish
d6b1a07ab2 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:42:41 +01:00
Caelish
40b06eba8e Fixed typos and made identical to RHEL version of this page 2015-12-06 14:42:00 +01:00
Caelish
2afc4eb415 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:40:52 +01:00
Caelish
5812197fc4 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:39:27 +01:00
Caelish
15334cfd93 Fixed typos and made identical to RHEL version of this page 2015-12-06 14:37:55 +01:00
Ionescu Bogdan
28841c5c9d Update add_firewall_banlist.html 2015-12-04 23:01:58 +02:00
Ionescu Bogdan
95538111b9 Update list_mail.html 2015-12-04 22:57:23 +02:00
Ionescu Bogdan
955d076f1e Update edit_package.html 2015-12-04 22:54:55 +02:00
Ionescu Bogdan
0e84a0f42e Update add_package.html 2015-12-04 22:44:41 +02:00
Ionescu Bogdan
4d233eda30 Update en.php 2015-12-04 22:33:15 +02:00
Ionescu Bogdan
36784316c6 Update ro.php
The correct translation for romanian language.
2015-12-04 20:50:53 +02:00
Olexandr Loskutov
438f171436 Update ua.php
Full translate for current version VestaCP
2015-12-04 08:07:56 +02:00
Olexandr Loskutov
4ede636e73 Update vst-install-rhel.sh
hotfix installer
2015-12-03 22:53:01 +02:00
Ionescu Bogdan
04f497d932 Update v-delete-sys-quota
- minor updates
- see: v-add-sys-quota
2015-12-03 03:08:36 +02:00
Ionescu Bogdan
bb037facbb Update v-add-sys-quota
- Supports journaled quotas (version 2 quota)
- Journaled quotas have the advantage that even after a crash no quota check is required
- Quotacheck on reboot
2015-12-03 03:00:06 +02:00
Flat
8e951ac72e 🔒 ♻️ Implement secure exec wrapper functions. 2015-12-02 21:30:04 +09:00
myrevery
6052df956c Replace cn.php
This is the new version completely from scratch.
Huge change, more than 100% of the translated degree.
Complete and extremely accurate Chinese localization translation.
Tip: Add some new keywords to improve the quality of translation.
2015-12-02 03:25:50 +08:00
Flat
6e13036780 🔒 Fix OS command injection vulnerability. 2015-11-29 17:19:10 +09:00
System Void
5d54f3bdc1 Update index.php 2015-11-24 08:01:24 +00:00
System Void
d5441fdf85 Added file existence check.
I added a check to see if the file exists.
2015-11-24 07:51:23 +00:00
System Void
4df23adb13 +backup directory check, -closing PHP tag.
I added a backup directory check (as of now, you can download fake backups).

I also removed the closing PHP tag that isn't needed.
2015-11-24 07:48:50 +00:00
Flat
dac0b5c686 Strict backup filename check. 2015-11-23 23:37:01 +09:00
Serghey Rodin
8503efa6fe Merge pull request #501 from Flatta/master
Added / Improved some Japanese translations.
2015-11-23 13:37:24 +02:00
Serghey Rodin
0d2dc08d74 Merge pull request #504 from Flatta/feature-detectlang
Detect user language (Feature request)
2015-11-23 13:37:01 +02:00
Serghey Rodin
3c09b5526f Merge pull request #503 from Flatta/fix-sec-fiv
Fix #502
2015-11-23 13:35:30 +02:00
Flat
e3c1b17e31 Fix minor typo. 2015-11-23 19:55:16 +09:00
Flat
2bd84f00f9 Detect user language 2015-11-23 19:46:38 +09:00
Flat
05b76fefb2 Split duplicated functions into web/inc/i18n.php 2015-11-23 18:40:36 +09:00
Flat
9ba1c686d5 Use soft-tabs. 2015-11-23 16:50:58 +09:00
Flat
dbeba76fa9 Improve grammar. 2015-11-23 16:42:21 +09:00
Flat
735fc1fc7a Fix #502 2015-11-23 16:24:14 +09:00
Flat
e1613be90c [LANG-JA] Some improvements. 2015-11-23 13:03:45 +09:00
Flat
e71352b979 Added / Improved some Japanese translations. 2015-11-22 23:58:50 +09:00
Joe M
35ccd19189 Duplicate session_start 2015-11-17 04:40:05 -05:00
Joe M
edd8bdebcf Duplicate session_start 2015-11-17 04:37:41 -05:00
Pavel Galkin
877f51010b TW translation fix
There is unnecessary code "<?php" on line 465. If we're use this
translation, we can get VestaCP internal server error. ;-(
2015-11-15 19:55:54 +03:00
Serghey Rodin
bcfe1eead4 fix for fm sudo usage 2015-11-11 21:53:07 +02:00
Serghey Rodin
9ec21f07f6 Merge pull request #483 from nguyenngocphuongnb/master
Translate new version strings, re-translate some wrong programing-phrases
2015-11-10 00:54:58 +02:00
Serghey Rodin
7b23de9d75 nginx repo url update 2015-11-09 23:52:38 +02:00
Serghey Rodin
cef9e16578 chkconfig firewalld off 2015-11-09 16:50:52 +02:00
Serghey Rodin
49739b5c4e Fix for lscpu on OpenVZ 2015-11-08 22:02:23 +02:00
Serghey Rodin
d4cd7cfb3a Support for Ubuntu 15.10 2015-11-08 21:40:07 +02:00
Serghey Rodin
24d8fca929 Start using .gitignore 2015-11-08 21:38:52 +02:00
Serghey Rodin
196d7024cb added cron as dep package to installer 2015-11-08 21:37:07 +02:00
Serghey Rodin
5604a90870 installer update (fail2ban) 2015-11-08 21:27:49 +02:00
nguyenngocphuongnb
d94a5dee5a Lowercase large string 2015-11-08 02:16:10 +07:00
nguyenngocphuongnb
e3ca4ba5fe Translation optimization 2015-11-08 01:27:28 +07:00
nguyenngocphuongnb
d0cb9c6e07 Translate new version strings, re-translate some wrong programing-phrases 2015-11-08 01:25:11 +07:00
nguyenngocphuongnb
5564a9a80b Remove invalid dot cause translation error 2015-11-08 00:54:37 +07:00
nguyenngocphuongnb
c58a200780 Merge remote-tracking branch 'refs/remotes/serghey-rodin/master' 2015-11-08 00:52:16 +07:00
nguyenngocphuongnb
e3149992e8 Merge remote-tracking branch 'refs/remotes/serghey-rodin/master' 2015-11-08 00:40:22 +07:00
Serghey Rodin
a16af0ec83 exclude config-version 2015-11-07 16:35:23 +02:00
Serghey Rodin
e8431de456 install notifications 2015-11-07 14:58:27 +02:00
Serghey Rodin
875474a951 fixed notification link 2015-11-07 00:13:41 +02:00
Serghey Rodin
16db6f903b removed wrong slash 2015-11-07 00:09:14 +02:00
Serghey Rodin
047f58a566 timestamp for sprite.png and templates.js 2015-11-06 23:41:32 +02:00
Serghey Rodin
6ea0061476 error_reporting 2015-11-06 22:54:06 +02:00
RhysIT
9189ca9488 Corrected spelling mistakes 2015-11-06 17:38:58 +02:00
Serghey Rodin
acc491b52d notification links to features page 2015-11-06 17:15:49 +02:00
Serghey Rodin
30dc9b7154 ignore tarballs 2015-11-06 14:41:59 +02:00
Serghey Rodin
95aab70c3e Release 0.9.8-15 2015-11-06 01:35:58 +02:00
Serghey Rodin
cdcda8d1e6 bulk operations for customized restore 2015-11-06 00:44:49 +02:00
Serghey Rodin
c9c8697f28 very final fixes for FM 2015-11-06 00:44:17 +02:00
Serghey Rodin
99994dc865 bulk operations fix 2015-11-06 00:43:32 +02:00
Serghey Rodin
e02e470d34 FileManager latest changes 2015-11-05 04:50:15 +02:00
Serghey Rodin
5dbb80aaf3 no old stuff 2015-11-05 04:48:45 +02:00
Serghey Rodin
905e5269a7 fix for bulk operations 2015-11-05 03:19:25 +02:00
Serghey Rodin
0794c23dbe commercial plugin links 2015-11-05 03:19:02 +02:00
Serghey Rodin
accfa41ce4 notification bell 2015-11-05 03:18:25 +02:00
Serghey Rodin
b7461afe06 footer update 2015-11-05 03:18:11 +02:00
Serghey Rodin
1c3ac33813 new tab name 2015-11-05 03:17:43 +02:00
Serghey Rodin
d207b7a752 FM changes 2015-11-05 03:17:21 +02:00
Serghey Rodin
f064c09667 Tab name 2015-11-05 03:14:15 +02:00
Serghey Rodin
89b62eb4ac border-bottom: none 2015-11-05 03:13:54 +02:00
Serghey Rodin
4da89d5fe1 remove debug 2015-11-05 03:12:33 +02:00
Serghey Rodin
8ec9ae5d86 quotes around path 2015-11-05 03:12:10 +02:00
Serghey Rodin
c06ba9fc9c safe way to check permissions 2015-11-05 03:11:34 +02:00
Serghey Rodin
a0ee9bbc98 one file at the time for now 2015-11-05 03:10:57 +02:00
Serghey Rodin
0011470eda Merge branch 'master' of github.com:serghey-rodin/vesta 2015-11-05 00:08:54 +02:00
Serghey Rodin
5e3a3bc901 Merge pull request #480 from vlad-ya/fix-ftp-user-names
Fix for the ftp user name prefix corruption
2015-11-04 21:32:52 +02:00
Vlad Ya
cc456f20b5 Proper fix for the prefix corruption (for user names with non-alphanumeric characters)
and keep the prevention of addition of ftp user names with non-alphanumeric characters as it was intended initially
2015-11-04 13:09:29 -05:00
Serghey Rodin
88149f94d5 commercial plugins 2015-11-04 00:21:11 +02:00
Serghey Rodin
4cf6641d0f symlinks fix 2015-11-03 18:52:38 +02:00
Serghey Rodin
03a6b6f34e style versioning 2015-11-03 18:52:15 +02:00
Serghey Rodin
4210399fc0 white search 2015-11-03 18:51:53 +02:00
Serghey Rodin
52a22e2f3a flushing pipe when domain doesn't exist 2015-11-03 14:20:36 +02:00
Serghey Rodin
d5371c3dcd removed error catcher 2015-11-03 14:15:41 +02:00
Serghey Rodin
305a6b1fb1 bulk operation for backup restore 2015-11-03 12:42:51 +02:00
Serghey Rodin
4531615b50 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-11-03 01:14:55 +02:00
Serghey Rodin
6ad69fb4ca disabled debug 2015-11-03 01:12:56 +02:00
Serghey Rodin
db4c4d333b fix for bulk operations 2015-11-03 01:11:26 +02:00
Serghey Rodin
0f8578f7a8 no delete button for now 2015-11-03 01:11:05 +02:00
Serghey Rodin
3d989fa74b backend template only for admin 2015-11-03 01:10:14 +02:00
Serghey Rodin
9754eb602f no suspend on user level 2015-11-03 01:09:40 +02:00
Serghey Rodin
84a967a6ab notifications
mend
2015-11-03 01:08:41 +02:00
Serghey Rodin
50784054d7 notifications 2015-11-03 01:08:23 +02:00
Serghey Rodin
4def19f6ff set default language 2015-11-03 01:08:03 +02:00
Serghey Rodin
868092219f improved server configuration page 2015-11-03 01:07:41 +02:00
Serghey Rodin
899b3d282b file manager fixes 2015-11-03 01:07:12 +02:00
Serghey Rodin
9ce85c8bc6 removed check for smooth deactivation 2015-11-03 01:01:52 +02:00
Serghey Rodin
98e6fec795 fix for netmask 2015-11-03 01:01:27 +02:00
Serghey Rodin
ac3ed7b081 license checker 2015-11-03 01:01:05 +02:00
Serghey Rodin
6626ba34bf Firewall support enable/disable 2015-11-03 01:00:44 +02:00
Serghey Rodin
b15b5e5cbd fixes for license manager 2015-11-03 00:58:39 +02:00
Serghey Rodin
a32b604ecd Merge pull request #476 from ozgurbozkurt/patch-4
Update tr.php
2015-11-03 00:52:06 +02:00
Serghey Rodin
9e90c16591 Merge pull request #475 from SysVoid/patch-3
Rename LICENSE.txt to LICENSE
2015-11-03 00:51:56 +02:00
Serghey Rodin
e34781d70f Merge pull request #478 from nguyenngocphuongnb/master
Add Vietnamese Language
2015-11-03 00:51:44 +02:00
nguyenngocphuongnb
408f8f3c2f Translate phrase "Cron job" into Vietnamese words 2015-11-03 02:24:23 +07:00
nguyenngocphuongnb
045e9242f9 Add Vietnamese Language
Add new language file for support Vietnamese language
2015-11-03 02:19:09 +07:00
Serghey Rodin
8cc1ddf101 filemanager fix 2015-11-02 15:31:36 +02:00
Serghey Rodin
60ebfe321a license manager 2015-11-02 15:28:16 +02:00
ozgurbozkurt
790cedbe79 Update tr.php 2015-11-01 01:40:05 +03:00
System Void
6fa8db714a Rename LICENSE.txt to LICENSE
Not usually a .txt extension.
2015-10-31 19:48:18 +00:00
Serghey Rodin
8ce221cb7b Merge pull request #473 from hellodanielting/patch-1
Forgotten RSA Private key
2015-10-30 18:58:52 +02:00
Serghey Rodin
52b9cc8664 Merge pull request #474 from hellodanielting/patch-2
Delete demo cert
2015-10-30 18:57:23 +02:00
Daniel Ting
a69d2ebcfb Delete (compromised?) cert
As the assumed corresponding private key for this cert is now publicly available, this certificate should not be used.
(in reference to my other pull request.)
2015-10-30 23:22:40 +11:00
Daniel Ting
b66f926af0 Forgotten RSA Private key?
Going through the source, I cannot see any reason that this should exist; seems orphaned, old, and "Why Publish the PRIVATE KEY?".
Perhaps some ancient private commits that didn't get cleaned ?
2015-10-30 23:18:35 +11:00
Serghey Rodin
d1baa84941 Merge pull request #467 from MarPiRK/master
Updated Polish translation
2015-10-30 14:03:53 +02:00
Serghey Rodin
71ea3c667d Merge pull request #469 from demon-goxa/patch-2
Fix vst-install-rhel.sh
2015-10-30 14:02:13 +02:00
Serghey Rodin
1a5652b14e Merge pull request #468 from demon-goxa/patch-1
Fix vst-install-debian.sh
2015-10-30 14:01:55 +02:00
Serghey Rodin
14d8003482 Merge pull request #470 from demon-goxa/patch-3
Fix vst-install-ubuntu.sh
2015-10-30 14:01:39 +02:00
Serghey Rodin
45fd7dc75b default backend 2015-10-30 13:53:41 +02:00
Demon_Goxa
6338361ba0 Fix vst-install-ubuntu.sh 2015-10-30 00:03:49 +03:00
Demon_Goxa
d8adf4f814 Fix vst-install-rhel.sh 2015-10-30 00:03:19 +03:00
Demon_Goxa
0db0f4b9da Fix vst-install-debian.sh 2015-10-30 00:01:51 +03:00
Serghey Rodin
b560c99ceb user notification backend 2015-10-29 15:01:14 +02:00
MarPiRK
10ed8021ef Updated Polish translation 2015-10-28 19:02:21 +01:00
Serghey Rodin
aa558a66c0 i18n update 2015-10-28 16:44:49 +02:00
Serghey Rodin
cc876a04dc Merge branch 'master' of github.com:serghey-rodin/vesta 2015-10-28 16:43:52 +02:00
Serghey Rodin
dbca2ffffe Merge pull request #414 from MarPiRK/master
Added Polish translation
2015-10-28 16:43:26 +02:00
Serghey Rodin
a0adca33ed Merge pull request #432 from Flatta/master
Added Japanese translation
2015-10-28 16:41:14 +02:00
Serghey Rodin
5d070fc9a5 Fixes for FM 2015-10-28 16:39:39 +02:00
Serghey Rodin
ec43524083 fix for js hint 2015-10-28 16:38:34 +02:00
Serghey Rodin
ae15d93763 removed template selector 2015-10-28 16:38:05 +02:00
Serghey Rodin
a5efa885d8 imroved favorites handler 2015-10-28 16:37:41 +02:00
Serghey Rodin
cd437282b2 php-fpm support 2015-10-28 16:36:29 +02:00
Serghey Rodin
91a804c1c8 check_result function 2015-10-28 16:34:41 +02:00
Serghey Rodin
062b7e81f0 switched to bc for math calculation 2015-10-28 16:33:55 +02:00
Serghey Rodin
fa4813cf89 exclusion list in array 2015-10-28 16:32:20 +02:00
Serghey Rodin
41ec0508fb no-php template 2015-10-24 19:04:07 +03:00
Serghey Rodin
083e820f57 set ip even if ip doesn't exist 2015-10-24 18:44:19 +03:00
Serghey Rodin
bcc02c858d new web template scheme 2015-10-24 18:43:42 +03:00
Serghey Rodin
0c25d7f4ae increased client_max_body_size to 256m 2015-10-24 17:17:20 +03:00
Serghey Rodin
56012d8719 smart way to hanlde php.ini 2015-10-24 16:48:35 +03:00
Serghey Rodin
80bf6422c4 no custom location for roundcube configs 2015-10-24 15:23:30 +03:00
Serghey Rodin
ad9c035f8c updated log location 2015-10-24 15:18:30 +03:00
Serghey Rodin
0c0b039d84 No apache2.2-common in old Ubuntu 2015-10-24 15:15:53 +03:00
Serghey Rodin
ad138d681c no versions at c.vestacp.com 2015-10-24 15:12:55 +03:00
Serghey Rodin
aa409cac25 remi argument handler 2015-10-24 15:06:20 +03:00
Serghey Rodin
5eb10ba388 new and better way to backup - tar without find 2015-10-24 14:57:30 +03:00
Serghey Rodin
c5ea206e5b fail tollerance against already synced domains 2015-10-22 18:01:54 +03:00
Serghey Rodin
2127cfd44b Removing debug loging 2015-10-22 17:41:51 +03:00
Serghey Rodin
551ca3753c Merge branch 'master' of github.com:serghey-rodin/vesta 2015-10-22 17:30:20 +03:00
Serghey Rodin
13d3fd476b File Manger stuff 2015-10-22 17:26:20 +03:00
Serghey Rodin
e3f636cb3a Fixes from Neilpang 2015-10-22 17:23:44 +03:00
Serghey Rodin
2e67a9d0ea Merge pull request #405 from janabimustafa/master
made email a requirement for ssl generation
2015-10-22 17:10:52 +03:00
Serghey Rodin
79e4f5ed26 Fix for application/javascript from infinitnet 2015-10-22 17:05:02 +03:00
Serghey Rodin
ddf19a4bbc Merge branch 'master' of github.com:serghey-rodin/vesta 2015-10-22 16:58:12 +03:00
Serghey Rodin
2322eed4c8 FS manager stuff 2015-10-22 16:57:55 +03:00
Serghey Rodin
fdce35d610 typo fix 2015-10-22 16:57:24 +03:00
Serghey Rodin
97a368afdf Merge pull request #422 from SysVoid/patch-1
Removed closing PHP tags
2015-10-22 16:56:26 +03:00
Serghey Rodin
6b96058e7f Merge pull request #424 from SysVoid/patch-2
Less installation steps.
2015-10-22 16:55:07 +03:00
Serghey Rodin
07db9c5a24 Merge pull request #435 from kkprince1998/fix-nginx-redir
fix 1/2
2015-10-22 16:51:14 +03:00
Serghey Rodin
979acdd115 Merge pull request #453 from SCelik/patch-1
Update v-update-user-quota
2015-10-22 16:45:04 +03:00
Serghey Rodin
e5eecb9900 Merge pull request #456 from hellodanielting/master
Update SSL Ciphers for nginx.conf
2015-10-22 16:42:17 +03:00
Serghey Rodin
7a1975ce39 Fix for MariaDB listing 2015-10-21 20:49:50 +03:00
Serghey Rodin
fa570e4009 json listing support 2015-10-21 20:29:01 +03:00
Serghey Rodin
4b9cb6e424 Correct shell setting when SFTP chroot is enabled 2015-10-21 20:28:46 +03:00
Serghey Rodin
e892898874 New vesta installer 2015-10-21 20:10:00 +03:00
Serghey Rodin
dce52823fb FileManager stuff 2015-10-21 19:29:45 +03:00
Serghey Rodin
ab7c5e9ce3 global suspend 2015-10-21 19:29:31 +03:00
Serghey Rodin
828d0edd7c new header and footer 2015-10-21 19:29:05 +03:00
Serghey Rodin
b55b174cc0 .htmlentities fix 2015-10-21 19:28:46 +03:00
Serghey Rodin
86d7c7f655 multiple name servers 2015-10-21 19:26:29 +03:00
Serghey Rodin
20613e92a9 global suspend 2015-10-21 19:25:38 +03:00
Serghey Rodin
44949ed4a3 118n for File Manager 2015-10-21 19:17:33 +03:00
Serghey Rodin
ddf1d55294 .escapeshellarg protection 2015-10-21 19:16:42 +03:00
Serghey Rodin
b6c152a258 Delete chains on firewall stop 2015-10-21 18:59:38 +03:00
Serghey Rodin
8eaa1b743c fix for pgsql listing 2015-10-21 18:57:38 +03:00
Serghey Rodin
1ed911f78f fix for missing chain after reboot 2015-10-21 18:57:20 +03:00
Serghey Rodin
d79be2ca68 fix for fail2ban ip removal 2015-10-21 18:56:49 +03:00
Serghey Rodin
92d7044c59 fix date/time format for fail2ban 2015-10-21 18:56:29 +03:00
Serghey Rodin
2b042c2fb5 multiple name servers support 2015-10-21 18:55:54 +03:00
Serghey Rodin
6691ea2c8b New syntax to hide password from logger 2015-10-21 15:57:54 +03:00
Serghey Rodin
a9cbdfe6ff Fix for borken exlucssion missing symlinks and hidden files 2015-10-21 15:56:19 +03:00
Serghey Rodin
bff45302f6 Fix for bulk actions 2015-10-21 15:55:07 +03:00
Serghey Rodin
bdc8111b06 Fix SERIAL sync in DNS cluster 2015-10-21 15:54:07 +03:00
Serghey Rodin
7b0824015f Improved remote API 2015-10-21 15:49:22 +03:00
Serghey Rodin
89c1f644fe Improved domain validation plus added SERIAL support 2015-10-21 15:47:32 +03:00
Serghey Rodin
941e01eadd Improved Even Logger + check_result() 2015-10-21 15:01:32 +03:00
Serghey Rodin
4307b1f827 FM HotKeys 2015-10-15 15:12:49 +03:00
Serghey Rodin
a35fa78389 FileManager stuff 2015-10-15 15:03:59 +03:00
Serghey Rodin
264b851d1a DNS Cluster Serial fix 2015-10-15 15:03:39 +03:00
Serghey Rodin
a379e01e5a FM style update 2015-10-13 14:24:23 +03:00
Serghey Rodin
7565e8217f FileManager stuff 2015-10-12 17:45:31 +03:00
Serghey Rodin
5c8e3d3489 flush vars before list them 2015-10-12 17:43:15 +03:00
Sertaç ÇELİK
83f1b3a426 Update v-update-user-quota 2015-10-10 00:39:53 +03:00
Sertaç ÇELİK
3bcad0078d Update v-update-user-quota
# Hard quota set to more than 10% of soft quota. This is more meaningful.
2015-10-10 00:23:33 +03:00
Serghey Rodin
4049a319a6 FileManager stuff 2015-10-08 15:07:53 +03:00
Daniel Ting
d967fb40c6 Merge pull request #1 from hellodanielting/hellodanielting-removeRC4
Update SSL Ciphers for nginx.conf
2015-10-08 19:13:19 +11:00
Daniel Ting
70a8f75f1b Update SSL Ciphers
To fix RC4 immediate deprecation by major web browsers. Using old configuration results in "Insecure Certificate" errors.
Strong Ciphers via CloudFlare (https://github.com/cloudflare/sslconfig/blob/master/conf).
Excluded CloudFlare's use of ChaCha cipher due to compatibility patch required.

Info Source:
https://tools.ietf.org/html/rfc7465
https://www.pcicomplianceguide.org/pci-dss-v3-1-and-ssl-what-you-should-do-now/
https://blog.digicert.com/major-browsers-announce-rc4-deprecation/
2015-10-08 19:10:59 +11:00
Serghey Rodin
8976066313 uniq databases during restore 2015-10-05 23:33:01 +03:00
Serghey Rodin
52db853acf FileManger stuff 2015-10-05 23:32:25 +03:00
Serghey Rodin
b6dd534b60 fix for caching template 2015-10-05 23:31:53 +03:00
Sertaç ÇELİK
362efbe902 Update v-update-user-quota 2015-10-03 02:45:43 +03:00
Serghey Rodin
a320b1f32c hotkeys for filemanager 2015-09-29 22:24:22 +03:00
Serghey Rodin
51125fc904 fix for symlinked /tmp dir 2015-09-29 17:59:04 +03:00
Serghey Rodin
687f36688a File Manager update 2015-09-29 14:25:28 +03:00
Serghey Rodin
1ce7c69383 multiple name servers 2015-09-28 02:02:13 +03:00
Serghey Rodin
3d47843586 mail settings hint 2015-09-28 02:02:02 +03:00
Serghey Rodin
9d2ebe561a file manager stuff 2015-09-28 02:01:19 +03:00
Serghey Rodin
99a403a2ef multiple name servers 2015-09-28 02:00:45 +03:00
Serghey Rodin
808d2c3849 search api for file manager 2015-09-28 01:58:31 +03:00
Serghey Rodin
bfd900a622 fix for php-fpm stack 2015-09-28 01:58:05 +03:00
Serghey Rodin
6e193e0852 FM updates 2015-09-18 17:45:03 +03:00
Serghey Rodin
7734c6cf04 user favourites 2015-09-18 17:44:17 +03:00
Serghey Rodin
93b2a8617a Jailed SFTP via OpenSSH 2015-09-18 17:42:48 +03:00
Serghey Rodin
f451b8a99a Updated template header 2015-09-14 17:08:07 +03:00
Serghey Rodin
587b12ceac ketboard shortcuts for vesta control panel 2015-09-14 17:06:34 +03:00
Serghey Rodin
eea2bf2306 Fixed favourites config name 2015-09-14 17:05:58 +03:00
Serghey Rodin
fb619f1f3b Link to system monitoring page 2015-09-10 17:07:28 +03:00
Serghey Rodin
df2c0baf63 fix for /32 netmask 2015-09-10 17:07:05 +03:00
Serghey Rodin
55eb1ec16a File Manager stuff 2015-09-10 14:35:17 +03:00
Serghey Rodin
cad14057cc API for user favourites 2015-09-10 14:34:52 +03:00
Serghey Rodin
15a3d9486e list dir 2015-09-09 16:50:23 +03:00
Serghey Rodin
ac7de9d619 File Manager stuff 2015-09-09 16:45:20 +03:00
Serghey Rodin
841c97982f Server monitoring tools 2015-09-09 16:45:09 +03:00
Serghey Rodin
9db728e1ad filemanager stuff 2015-09-07 17:35:40 +03:00
Serghey Rodin
6a7b3d65c4 humanize_usage update 2015-09-07 16:45:18 +03:00
Serghey Rodin
62a495bd21 fix for fs quota unlim 2015-09-07 16:43:54 +03:00
Serghey Rodin
2850492f55 optimized web domain adding (almost 2x faster 2015-09-07 16:43:02 +03:00
Kaiden Prince
e0e4964b1c fix 2/2
serghey-rodin/vesta#434
2015-08-29 21:42:26 -04:00
Kaiden Prince
6cfa7dde10 fix 1/2
serghey-rodin/vesta/#434
2015-08-29 21:38:41 -04:00
Serghey Rodin
1246ded35a Optimized chown & chmod calls 2015-08-20 18:09:18 +03:00
Serghey Rodin
9e7b952d34 Ignore errors if certificate is missing 2015-08-20 18:05:45 +03:00
Serghey Rodin
8cc3df2db0 Ingore exim restart issues if any 2015-08-20 18:04:42 +03:00
Serghey Rodin
8194ee854f fixed suspend/unsuspend issues 2015-08-20 18:03:22 +03:00
Serghey Rodin
930290f518 full path to named-checkconf command 2015-08-20 18:02:20 +03:00
Serghey Rodin
15d1f4f4c9 Improved file manager API functions 2015-08-20 18:01:27 +03:00
Flat
7c3a7a81e3 Fixed typo 2015-08-19 11:19:38 +09:00
Flat
93e15d64ce Added Japanese support 2015-08-18 19:04:43 +09:00
Flat
5ef0db1e25 Added CJK text support for the + button
Prohibit word breaks for CJK texts at #tooltip
2015-08-18 19:03:25 +09:00
System Void
0a32d520fc Less installation steps.
I prefer installing like this, so I assume other will.
2015-08-04 15:22:06 +01:00
System Void
de6fcff868 Cleaned it up a bit. 2015-08-04 15:00:51 +01:00
System Void
01541088ce Removed closing PHP tags. 2015-08-04 14:46:35 +01:00
System Void
b2766e5d88 Removed double space that was not needed.
Saving bytes, that's all!
2015-08-04 14:44:55 +01:00
System Void
fe21f1cc32 Removed closing PHP tags. 2015-08-04 14:44:11 +01:00
System Void
9b68b7eb93 Removed closing PHP tags. 2015-08-04 14:42:32 +01:00
System Void
7a7788b185 Removed closing PHP tags. 2015-08-04 14:42:06 +01:00
System Void
54f23757ea Removed closing PHP tags.
They aren't needed, and every little helps.
2015-08-04 14:41:32 +01:00
System Void
72d2885b12 Removed closing PHP tags
They aren't needed, and every little helps. :)
2015-08-04 11:45:22 +01:00
Serghey Rodin
7bc8af40f3 fix for mbox creation 2015-07-26 19:34:27 +03:00
Serghey Rodin
283c71a672 Changed comment for nginx.conf 2015-07-24 17:10:13 +03:00
MarPiRK
8a6f33c04e Added Polish translation 2015-07-18 09:36:57 +02:00
Serghey Rodin
dc396f2f72 cleanup proxy cache pool 2015-07-16 18:30:28 +03:00
Serghey Rodin
4a43952b26 removed shell selection for user accounts 2015-07-16 02:26:15 +03:00
Serghey Rodin
8e47676fda HotKey navigation help 2015-07-16 02:24:42 +03:00
Serghey Rodin
a1ac9cfee8 WebFileManager JS stuff 2015-07-16 02:23:55 +03:00
Serghey Rodin
998b500aca WebFileManager css styles 2015-07-16 02:23:21 +03:00
Serghey Rodin
6535c5c7d8 fix for long dns records 2015-07-16 02:22:57 +03:00
Serghey Rodin
75374e264a API backend for Web File Manager 2015-07-16 02:21:22 +03:00
Serghey Rodin
edcd549e4c permissions on htpasswd file 2015-07-13 23:20:51 +03:00
Serghey Rodin
3e3ecca996 fix for unlimited mail quota 2015-07-13 22:59:36 +03:00
Serghey Rodin
99e73ded9c http auth api feature 2015-07-13 22:58:52 +03:00
Serghey Rodin
45426d53fc fix for postgres service listing 2015-07-13 22:41:06 +03:00
Ubuntu
882625a279 Added a check for username length 2015-07-04 02:01:42 +00:00
Ubuntu
fac9bdf415 made email a requirement for ssl generation 2015-07-04 01:35:50 +00:00
Serghey Rodin
010d132024 no custom css 2015-07-01 02:22:57 +03:00
Serghey Rodin
8be83a9e73 fix for iptables restart on Debian/Ubuntu 2015-07-01 02:22:43 +03:00
Serghey Rodin
def1198975 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-07-01 01:37:31 +03:00
Serghey Rodin
16bc6193c1 mysql stop/start fix for rhel 2015-07-01 01:37:08 +03:00
Serghey Rodin
bbd5befedd system check for wildcard search 2015-07-01 01:36:45 +03:00
Serghey Rodin
d231714a2d simple email validator 2015-07-01 01:35:38 +03:00
Serghey Rodin
7d6cadc034 chmod/touch/mkdir command consolidation 2015-07-01 01:34:54 +03:00
Serghey Rodin
21c44a8ab9 list by creation date 2015-07-01 01:34:06 +03:00
Serghey Rodin
9ba91b4b02 leave page /starred sorting 2015-07-01 01:33:29 +03:00
Serghey Rodin
e1b9d53541 js ftp user bugfix 2015-07-01 01:32:16 +03:00
Serghey Rodin
16ca690301 css improvements 2015-07-01 01:31:50 +03:00
Serghey Rodin
2289b2d8bb added sort-star class 2015-07-01 01:31:06 +03:00
Neilpang
c87b59ecb2 a space is needed
a space is needed
2015-06-22 22:39:35 +08:00
Serghey Rodin
b82ca32651 Merge pull request #393 from JWeiry/master
[FIX] Wrong dovecot.tar.gz location for CentOS 6/7
2015-06-22 15:11:27 +03:00
James Weir
670b709f8f Added if statements to check for directories/files before removing them.
Updated download location to include $release structure from http://c.vestacp.com/0.9.8/rhel/
Fixed error message that appears if /etc/dovecot doesn't exist when chowning.
2015-06-22 13:26:16 +10:00
Serghey Rodin
29f5cc6aca lowercase on sort_by text 2015-06-21 21:28:01 +03:00
Serghey Rodin
5b06701fdc Sort_by feature 2015-06-21 20:30:20 +03:00
Serghey Rodin
4ebd88bc16 js bugfixes 2015-06-21 20:29:40 +03:00
Serghey Rodin
9e9327df0b bulk fail2ban 2015-06-21 20:28:55 +03:00
Serghey Rodin
a5c966123f compact styles 2015-06-21 20:27:57 +03:00
Serghey Rodin
f5c686a5e2 Added words for sorting feature 2015-06-21 19:04:26 +03:00
Serghey Rodin
afb11b4a52 fix for chrome on win7 2015-06-12 00:59:29 +03:00
Serghey Rodin
c949fb7215 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-06-12 00:58:33 +03:00
Serghey Rodin
dfcdb75dfd Fix for server restart url 2015-06-12 00:58:26 +03:00
Serghey Rodin
f0cd860510 Merge pull request #379 from alex-connor/patch-1
Update ua.php
2015-06-11 16:34:20 +03:00
Serghey Rodin
457da0e647 Merge pull request #384 from cdnmall/patch-1
Update list_updates.html
2015-06-11 16:33:48 +03:00
Serghey Rodin
225ababaf4 Merge pull request #386 from alex-connor/patch-2
Update ua.php
2015-06-11 16:31:56 +03:00
Olexandr Loskutov
43faa3aceb Update ua.php
Dates and Server management
2015-06-11 15:48:04 +03:00
Serghey Rodin
68694608fd Merge pull request #385 from flynet70/patch-1
Update vst-install-debian.sh
2015-06-11 15:36:22 +03:00
flynet70
3f9c63b0fd Update vst-install-debian.sh
typo mistake
2015-06-11 16:39:44 +05:00
Joe M
4adbb16cbe Update list_updates.html
Fix broken links
2015-06-11 04:19:53 -04:00
Serghey Rodin
e5966885f6 Merge pull request #381 from ozgurbozkurt/patch-2
Update tr.php
2015-06-08 14:23:12 +03:00
ozgurbozkurt
774b8a5835 Update tr.php
A little update for translation
2015-06-07 18:11:46 +03:00
Serghey Rodin
d45f42783d ip list fix 2015-06-04 18:42:14 +03:00
Serghey Rodin
22e836c4d3 firewall comment field lenght 2015-06-04 18:24:00 +03:00
Serghey Rodin
0e3c13744e removed salt lenght check 2015-06-04 18:23:37 +03:00
Serghey Rodin
c4b629bdd1 disable error reporting 2015-06-04 15:57:45 +03:00
Serghey Rodin
d3c98afa61 fix for ip selection ctr+c 2015-06-04 15:53:34 +03:00
Serghey Rodin
ea24113610 fix for md5 hashes 2015-06-04 14:18:42 +03:00
Serghey Rodin
5a4ba74d1b fix font color / dropdown list 2015-06-04 13:43:05 +03:00
Serghey Rodin
cfec39075c version up 2015-06-04 04:42:33 +03:00
Serghey Rodin
bb2e4f5711 new set of conf files 2015-06-04 03:02:25 +03:00
Serghey Rodin
810c90b67b Dates and Server management 2015-06-04 01:08:41 +03:00
Serghey Rodin
c10c6598d2 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-06-04 00:56:56 +03:00
Serghey Rodin
ecf96a73a1 stop icon fix 2015-06-04 00:56:10 +03:00
Olexandr Loskutov
874317e7a8 Update ua.php
Update UI
2015-06-03 20:09:43 +03:00
Serghey Rodin
d20eec0b97 Merge pull request #378 from alex-connor/patch-6
Update ua.php
2015-06-03 20:05:59 +03:00
Olexandr Loskutov
6bbd047e7b Update ua.php
Додавання скорочених назв місяців
2015-06-03 20:04:20 +03:00
Serghey Rodin
59b38a08fe Merge pull request #362 from virtualweb-at/master
Update de.php
2015-06-03 19:55:39 +03:00
Serghey Rodin
d90e116258 Merge pull request #361 from virtualweb-at/patch-1
Update de.php
2015-06-03 19:55:00 +03:00
Serghey Rodin
5bc41a92fe Merge pull request #364 from tjebbeke/patch-1
dubbel line removed
2015-06-03 19:53:56 +03:00
Serghey Rodin
e0279d0ba4 Merge pull request #366 from ZonD80/master
Ivalid check removal, fix unability to add 4-level+ wildcard A records
2015-06-03 19:52:54 +03:00
Serghey Rodin
977d937c86 new conf 2015-06-03 19:35:03 +03:00
Serghey Rodin
26360cad99 longer salt 2015-06-03 19:34:17 +03:00
Serghey Rodin
77f0aa6d8a bad date in %changelog 2015-06-03 19:19:30 +03:00
Serghey Rodin
d3e05ca956 0.9.8-13 2015-06-03 18:54:46 +03:00
Serghey Rodin
3f12b04cfa suspend/unsuspend additional ftp accounts 2015-06-03 18:40:10 +03:00
Serghey Rodin
a5ff23de74 Restore traffic pipe 2015-06-03 18:39:54 +03:00
Serghey Rodin
fbb49197be Removed validation on host user 2015-06-03 18:39:42 +03:00
Serghey Rodin
9c30e4b8dc style update 2015-06-03 17:42:23 +03:00
Serghey Rodin
4929747f70 Date translation 2015-06-03 17:41:43 +03:00
Serghey Rodin
6d9c53612d nulled error outout 2015-06-03 17:40:52 +03:00
Serghey Rodin
cbb8c593aa Server management 2015-06-03 17:39:27 +03:00
Serghey Rodin
7535a1b6be Mail wrapper 2015-06-03 17:38:31 +03:00
Serghey Rodin
b8f5a1161f Mysql password change 2015-06-03 17:38:18 +03:00
Serghey Rodin
527e4a9a62 UI update 2015-06-03 02:31:03 +03:00
Serghey Rodin
0f7110b0e7 option to disable local backups 2015-06-03 02:24:22 +03:00
Serghey Rodin
2c420440ac adding some flexibilty 2015-06-03 02:23:41 +03:00
Serghey Rodin
61fe8fc2a9 don't make user backups if backup ssystem is disabled 2015-06-03 02:22:55 +03:00
Serghey Rodin
8f2baae014 informative errors + sftp_path fix 2015-06-03 02:22:43 +03:00
Serghey Rodin
3c3a399fd6 fix for nginx listing 2015-06-02 01:34:53 +03:00
Serghey Rodin
070bc98ff9 Swedish language support. Thanks to E.C. Westgren 2015-05-31 10:06:59 +03:00
Serghey Rodin
18da1cf1b9 syntax fix for ip management 2015-05-31 10:02:28 +03:00
Serghey Rodin
60f9f276b8 UI improvements 2015-05-29 19:51:24 +03:00
Serghey Rodin
f11c778f13 DNS Template 2015-05-29 19:50:14 +03:00
Serghey Rodin
b729d58eea missing quote 2015-05-29 19:50:02 +03:00
Serghey Rodin
fe5ec0428e fix for lang switcher 2015-05-29 19:49:42 +03:00
Serghey Rodin
7281a4b5bb unlimited quota support 2015-05-29 19:48:34 +03:00
Serghey Rodin
aaa841964e shortened email translation 2015-05-29 02:29:08 +03:00
Serghey Rodin
067a2c862a The New Desing 2015-05-29 02:07:55 +03:00
Serghey Rodin
def9cc4ea6 v-generate-api-key 2015-05-29 02:01:52 +03:00
Serghey Rodin
0128d228d3 rename services to server 2015-05-29 01:56:37 +03:00
Serghey Rodin
1ee544fed6 TZ list 2015-05-29 01:55:43 +03:00
Serghey Rodin
d4de297092 web_include fix 2015-05-29 01:54:48 +03:00
Serghey Rodin
f9033d8102 delete debug info 2015-05-29 01:53:59 +03:00
Serghey Rodin
94944001e3 restart nginx only if it is enabled 2015-05-29 01:53:31 +03:00
Serghey Rodin
3e8f6b622b wildcard support for SSL generator 2015-05-29 01:51:58 +03:00
Serghey Rodin
18ebaec857 pidof fallback for service list 2015-05-29 01:51:25 +03:00
Serghey Rodin
5dbadaa730 TimeZone handlers 2015-05-29 01:50:40 +03:00
Serghey Rodin
003cbbea47 union calls for FTP/SFTP backups 2015-05-29 01:45:15 +03:00
ZonD80
84d038c473 Ivalid check removal, fix unability to add 4-level+ wildcard A records 2015-04-24 14:23:15 +03:00
Tjebbe Lievens
6ac1253bbf dubbel line removed
Line 93 & 94 are the same: /usr/sbin/userdel -f $user >> /dev/null 2>&1
2015-04-21 14:52:10 +02:00
Serghey Rodin
7a9c937ca1 increased rrd graph size 2015-04-17 23:19:48 +03:00
virtualweb-at
6953bb8c78 Update de.php 2015-04-17 19:19:09 +02:00
virtualweb-at
c2b8038112 Update de.php 2015-04-17 19:02:59 +02:00
Serghey Rodin
51bb543d5b Added new word - server 2015-04-17 17:14:20 +03:00
Serghey Rodin
42b8ac31dd trigger firewall update on ip functions 2015-04-17 16:11:27 +03:00
Serghey Rodin
ebe8173af1 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-04-16 23:06:26 +03:00
Malishev Dmitry
f871fafa12 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-04-16 14:31:15 -04:00
Malishev Dmitry
d3390d7ad0 Add/edit package unlim patch; 2015-04-16 14:30:45 -04:00
Serghey Rodin
83b7110c0a include new db type in vesta config 2015-04-16 02:44:15 +03:00
Serghey Rodin
567ce7e832 php-fpm support 2015-04-16 02:43:31 +03:00
Serghey Rodin
a93d9c5fed Merge pull request #267 from cameronhimself/master
Cut blank lines when counting domains for IP addresses
2015-04-14 14:04:41 +03:00
Serghey Rodin
144b58fc15 Merge pull request #297 from devsli/master
Fix messages
2015-04-14 14:02:40 +03:00
Serghey Rodin
273c9f95cf Merge pull request #352 from Decadence/v_chains_output
Chains select output in foreach instead of hardcoding it
2015-04-14 14:01:42 +03:00
Serghey Rodin
aa8be61933 Merge pull request #349 from kotso/master
HTTP on 8083 and WHMCS module fixes
2015-04-14 14:00:08 +03:00
Serghey Rodin
5d16423cdb Merge pull request #353 from crackdepirate/patch-1
updated line 111, little typo error.
2015-04-14 13:58:08 +03:00
Serghey Rodin
f0b90d8f79 Merge pull request #354 from crackdepirate/patch-3
updated line 111, little typo error.
2015-04-14 13:57:57 +03:00
Serghey Rodin
6cb1e1f850 Merge pull request #355 from crackdepirate/patch-2
updated line 111, little typo error.
2015-04-14 13:57:26 +03:00
crackdepirate
9c33bf9e66 updated line 111, little typo error. 2015-04-10 19:59:28 -04:00
crackdepirate
1cbc554049 updated line 111, little typo error. 2015-04-10 19:58:18 -04:00
crackdepirate
f496229b58 updated line 111, little typo error. 2015-04-10 19:56:47 -04:00
Victor Isadov
0bed9eb164 Chains select output in foreach instead of hardcoding it 2015-04-10 00:03:55 +03:00
Serghey Rodin
dfbcc06269 Disk recalc fix from Ian van Wijk 2015-04-08 14:59:09 +03:00
Serghey Rodin
8a3f8592cc sha-512 passwords func 2015-04-04 16:49:10 +03:00
Serghey Rodin
1a7612cc66 password transmission via tmp files 2015-04-04 16:48:22 +03:00
Serghey Rodin
1021bd4ab2 new background 2015-03-30 01:16:03 +03:00
Serghey Rodin
602a6e60ce improved restart function for ubuntu 2015-03-30 01:14:18 +03:00
Serghey Rodin
1a1d333ea4 improved sql functions 2015-03-29 14:43:02 +03:00
Serghey Rodin
cb99788a43 improvements on sftp backups 2015-03-29 12:40:24 +03:00
Serghey Rodin
1bcdef615c password transmission via tmp files 2015-03-29 12:39:42 +03:00
kotso
1d12eb46d4 PHP syntax errors fix 2015-03-25 14:45:44 +04:00
kotso
e690ee5048 Updated changes in other distribution folders
I think this file should be stored in some other folder. No need to keep
same copy of file in 3 different folders. This file is not OS specific.
2015-03-25 01:32:10 +04:00
kotso
63e3728999 Fixed Multiple bugs in WHMCS module
Added module debug logging
Fixed simple bugs in function result codes returns
2015-03-25 01:23:28 +04:00
kotso
2e78f1e3c9 Fixed error when connecting to 8083 over HTTP
Fixed error "400 The plain HTTP request was sent to HTTPS port"

By putting custom error page on http error coder 497 that redirects http
uri to https uri
2015-03-25 00:38:51 +04:00
Serghey Rodin
fcea9ab012 Merge pull request #346 from oytunyuksel/patch-1
Update tr.php
2015-03-24 13:09:23 +02:00
Oytun Yüksel
3f41ddaa2e Update tr.php
translate incomplete translations
2015-03-15 00:19:35 +02:00
Serghey Rodin
f9ab13dc71 Merge pull request #345 from loolooyyyy/firewall-db-local-only
By default, allow conn to DB from localhost only
2015-03-13 20:37:39 +02:00
loolooyyyy
084468ca42 By default, allow conn to DB from localhost only 2015-03-13 15:14:35 +03:30
Serghey Rodin
63399984c0 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-03-10 18:33:57 +02:00
Serghey Rodin
a6a5f94668 Commented out IPv6 CloudFlare pool and added new IPv4 range 2015-03-10 18:30:06 +02:00
Serghey Rodin
179d5e2693 Merge pull request #344 from cemendur/master
Greek language support.
2015-03-10 18:01:37 +02:00
cemendur
c871a6e7dc Greek language support. 2015-03-10 16:41:31 +02:00
Serghey Rodin
8ef6558b3d manually merged 2015-03-10 00:47:06 +02:00
Serghey Rodin
44f9680299 Fix for pma on Ubuntu 2015-03-09 19:12:26 +02:00
Serghey Rodin
5c59126063 Merge pull request #341 from flynet70/master
Update v-backup-user
2015-03-04 23:00:32 +02:00
Serghey Rodin
9a63491f08 Merge pull request #342 from sfer23/patch-1
Fix bug with redurant redirect
2015-03-03 22:43:08 +02:00
sfer23
850d215c1f Fix bug with redurant redirect
If I use nginx to assign 127.0.0.1:8083 with one of named VirtualHost - I have error when login by user (Browser redirect me to self domain name with 8083 port, which is already closed).
Also this fix doesn't break anything on default use.
2015-03-03 22:06:56 +02:00
flynet70
bbffe9fffb Update v-backup-user
Fix delete deprecated backup string in user's backup.conf if only ftp backup used.
2015-03-03 18:47:10 +05:00
Malishev Dmitry
59467f6385 Unlimited and toggle_password icon images added 2015-02-26 12:14:12 -05:00
Malishev Dmitry
9b7015a1c7 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-02-26 12:11:33 -05:00
Malishev Dmitry
aae7f839a3 Unlimited values ui changed; Toggle password view; Ctrl + clicks navigation added 2015-02-26 12:03:39 -05:00
Serghey Rodin
a1684834ec Merge pull request #335 from ss-abramchuk/sftp
Backup via SFTP
2015-02-24 16:05:01 +02:00
Sergey Abramchuk
70490f5124 Implement backup functionality via sftp 2015-02-24 10:02:02 +03:00
Serghey Rodin
f78a07878f Merge pull request #332 from StudioMaX/patch-1
Update v-update-firewall
2015-02-24 02:33:46 +02:00
Serghey Rodin
337e182fe5 Merge pull request #331 from anton-reutov/patch-21
Update vst-install-debian.sh
2015-02-24 02:18:27 +02:00
Serghey Rodin
69726c8677 Merge pull request #330 from anton-reutov/patch-20
Update vst-install-ubuntu.sh
2015-02-24 02:18:10 +02:00
Serghey Rodin
e5ca6754a6 Merge pull request #333 from alex-connor/patch-5
Update ua.php
2015-02-24 02:12:40 +02:00
Serghey Rodin
4a62dd4304 Merge pull request #329 from anton-reutov/patch-19
Update proftpd.conf
2015-02-24 01:01:41 +02:00
Olexandr Loskutov
adace91665 Update ua.php
Виправлення помилок, вдосконалення перекладу
2015-02-22 22:53:14 +02:00
StudioMaX
7d054947ff Update v-update-firewall
В контейнерах OpenVZ нет возможности просмотреть загруженные модули ядра, и вызов lsmod или modprobe nf_conntrack ничего не возвратит или выдаст ошибку, даже если модуль загружен.

Как вариант проверяем наличие опции
/sbin/sysctl net.netfilter.nf_conntrack_max
Это даст понять, загружен nf_conntrack или нет и при наличии добавит правило
-A INPUT -p tcp -m state --state RELATED,ESTABLISHED -j ACCEPT

Проверить доступность nf_conntrack_ftp в контейнере скорее всего нельзя, по крейней мере я не могу придумать как. Поэтому в iptables как и раньше будет добавляться правило, как будто этот модуль недоступен, с указанием диапазона портов.
2015-02-22 13:40:53 +06:00
anton-reutov
ae49ba353b Update vst-install-debian.sh 2015-02-21 15:10:58 +03:00
anton-reutov
04dccc917e Update vst-install-ubuntu.sh 2015-02-21 14:37:25 +03:00
Serghey Rodin
df789310fb Fix for better backup.conf cleaning 2015-02-20 22:09:41 +02:00
anton-reutov
5f2ab756a9 Update proftpd.conf 2015-02-20 22:20:07 +03:00
Serghey Rodin
28b9720db5 Merge pull request #327 from anton-reutov/patch-17
Update 20-imap.conf
2015-02-19 20:55:19 +02:00
Serghey Rodin
2339351e3d Merge pull request #326 from anton-reutov/patch-16
Update dovecot.conf
2015-02-19 20:55:08 +02:00
anton-reutov
61133e8c89 Update 20-imap.conf 2015-02-19 21:42:07 +03:00
anton-reutov
b1014c9cce Update dovecot.conf 2015-02-19 21:40:25 +03:00
Serghey Rodin
6e7d926cb3 Merge pull request #324 from anton-reutov/patch-14
Update dovecot.conf
2015-02-19 18:04:46 +02:00
Serghey Rodin
96968aff21 Merge pull request #323 from anton-reutov/patch-13
Update 20-imap.conf
2015-02-19 18:04:15 +02:00
Serghey Rodin
0662da9975 Merge pull request #322 from anton-reutov/patch-12
Update dovecot.conf
2015-02-19 17:56:53 +02:00
anton-reutov
e1db47b7ac Update dovecot.conf 2015-02-19 18:46:17 +03:00
anton-reutov
71d2daf9e3 Update 20-imap.conf 2015-02-19 18:43:28 +03:00
anton-reutov
97cbfafbed Update dovecot.conf 2015-02-19 18:40:45 +03:00
Serghey Rodin
253e28ede2 Nginx-less user templates 2015-02-19 02:02:19 +02:00
Serghey Rodin
40b23f0873 fix for i18n counters 2015-02-19 02:02:02 +02:00
Serghey Rodin
0b1abcfe04 Fix for firewall.tar.gz issue 2015-02-19 01:06:17 +02:00
Serghey Rodin
f7236d034e Fix for Nginx-less setup 2015-02-18 02:33:49 +02:00
Serghey Rodin
a2f012c7af create default imap folders 2015-02-18 02:29:00 +02:00
Serghey Rodin
6c4a08cf1e fix for top panel 2015-02-17 22:10:41 +02:00
Serghey Rodin
61288a2355 unlimitted hosting packages 2015-02-17 18:25:50 +02:00
Serghey Rodin
fd964610a1 Passive FTP port ranges 2015-02-16 23:23:41 +02:00
Serghey Rodin
8e0416cd74 CloudFlare IP pool reference 2015-02-16 18:25:42 +02:00
Serghey Rodin
58a75cbde4 transparent nginx integration for CloudFlare 2015-02-16 17:27:25 +02:00
Serghey Rodin
08c1deaef3 Merge pull request #317 from alex-connor/patch-4
Update ua.php
2015-02-13 23:48:29 +02:00
Olexandr Loskutov
6523deb223 Update ua.php
Виправлення помилки
2015-02-13 23:41:34 +02:00
Serghey Rodin
5ee56539c7 Merge pull request #316 from anton-reutov/patch-11
Update ru.php
2015-02-13 23:34:16 +02:00
anton-reutov
86b904d390 Update ru.php 2015-02-14 00:28:12 +03:00
Serghey Rodin
0cd8d81f27 Merge pull request #315 from anton-reutov/patch-10
Update proftpd.conf
2015-02-13 22:08:36 +02:00
Serghey Rodin
3fcbfbff34 Merge pull request #314 from anton-reutov/patch-9
Update proftpd.conf
2015-02-13 22:08:27 +02:00
Serghey Rodin
4fea02e677 Merge pull request #313 from anton-reutov/patch-8
Update proftpd.conf
2015-02-13 22:08:16 +02:00
anton-reutov
76232bd612 Update proftpd.conf 2015-02-13 23:01:09 +03:00
anton-reutov
d6c230bcac Update proftpd.conf 2015-02-13 22:33:24 +03:00
anton-reutov
9817661b45 Update proftpd.conf 2015-02-13 22:02:15 +03:00
Malishev Dmitry
3bc6479ec9 unlim for hoting packages 2015-02-11 17:18:31 -05:00
Malishev Dmitry
b5d87dfc06 Unlim toggle UI items 2015-02-09 18:45:07 -05:00
Malishev Dmitry
01963489ab Merge branch 'master' of github.com:serghey-rodin/vesta 2015-02-09 17:18:05 -05:00
Malishev Dmitry
ac8a430ab8 Data controls are now shown only on hover and active state 2015-02-09 17:17:46 -05:00
Serghey Rodin
f437f70e69 fix for openvz ip list 2015-02-09 00:11:23 +02:00
Serghey Rodin
ba3cc72281 Fix for PerconaDB 2015-02-05 16:51:32 +02:00
Malishev Dmitry
e7935d387f JS cookie handle 2015-02-03 16:55:03 -05:00
Malishev Dmitry
e9be41692c Send email on user changed ftp user password 2015-02-03 16:07:58 -05:00
Malishev Dmitry
efc777aff1 Shift click functionality 2015-02-03 16:02:12 -05:00
Malishev Dmitry
7991911799 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-02-03 12:21:25 -05:00
Malishev Dmitry
54bfc461cd Hide/Unhide functionality 2015-02-03 11:14:26 -05:00
Serghey Rodin
9a84ee4cca PROXY_SYSTEM instead of PROXY_SSL fixes #305 2015-02-02 22:30:42 +02:00
Serghey Rodin
164450634a Fix for domain deletition on remote node 2015-01-30 00:01:38 +02:00
Serghey Rodin
ba8a0800e5 Merge branch 'master' of github.com:serghey-rodin/vesta 2015-01-26 18:37:16 +02:00
Leonid Suprun
c1195d1f30 Clarify "user admin exists" message 2015-01-26 12:32:37 +03:00
Leonid Suprun
c426be582a apt-get, not yum 2015-01-26 11:59:09 +03:00
Serghey Rodin
642db37c97 Merge pull request #294 from devsli/ubuntify
Do not overwrite default sudoers config (Ubuntu installer)
2015-01-25 17:18:56 +02:00
Leonid Suprun
57b9104369 /etc/sudoers not modified during installation 2015-01-24 11:37:26 +03:00
Leonid Suprun
3924ede8bb Do not overwrite default sudoers config 2015-01-24 11:32:03 +03:00
Serghey Rodin
11c5d02fdc Merge pull request #291 from ThomasGlass/patch-1
Fix spelling mistake
2015-01-23 23:57:57 +02:00
Serghey Rodin
b813717a17 Merge pull request #293 from devsli/patch-1
Fix typo
2015-01-23 23:52:12 +02:00
Serghey Rodin
084142cdae Create default imap folders 2015-01-23 22:47:35 +02:00
Leonid Suprun
7bfb387092 Fix possible type 2015-01-23 14:50:55 +03:00
Leonid Suprun
602198801d Little typo 2015-01-23 14:43:00 +03:00
ThomasG
4d36c9106c Fix spelling mistake
Noticed when redesigning template
2015-01-22 21:37:10 +00:00
Serghey Rodin
df9647bce8 Merge pull request #288 from 0x0d/master
Security vulnerabilities fix
2015-01-19 16:51:00 +02:00
INVENT
512283e528 Potential remote code execution vulnerability fix.
Can be exploitable, when we have X-Forwarded-For->X-Real-IP
transformation.
2015-01-19 15:51:46 +03:00
INVENT
9c59a69b1a Buffer overflow vulnerability fix 2015-01-19 15:22:53 +03:00
INVENT
c0d5b3765a Auth bypass vulnerability fix 2015-01-19 15:14:15 +03:00
Serghey Rodin
4406e814f2 Merge pull request #279 from kubuntux/patch-1
Fixed line 59 - should append the account only
2015-01-14 02:39:37 +02:00
Serghey Rodin
4bd4f2ac07 Merge pull request #272 from zapalm/master
updated apache template 'basedir'
2015-01-11 20:56:45 +02:00
Serghey Rodin
242ac15d5d Improved OS selector 2015-01-11 20:51:05 +02:00
Serghey Rodin
8d4a0127d6 TimeZone API 2015-01-11 20:35:46 +02:00
Serghey Rodin
14c507685e dump mysql database using --single-transaction 2015-01-11 20:34:04 +02:00
Serghey Rodin
809e475693 Check for negative counter values 2015-01-11 20:33:25 +02:00
Serghey Rodin
c2f38eb30d Verification for suspended cron jobs 2015-01-11 20:31:40 +02:00
James Alvarez
2a426c5fd3 Fixed line 59 - should append the account only 2015-01-11 00:30:17 +08:00
zapalm
40b34fdadb updated apache template 'basedir' for allowing writing access to the user's temporary directory 2014-12-24 10:31:19 +11:00
Serghey Rodin
d21a6d4fe5 Improved backup var validation 2014-12-19 00:39:59 +02:00
Serghey Rodin
ba913ba0e7 XSS security fix 2014-12-19 00:39:08 +02:00
Serghey Rodin
b978e72977 Multiple changes for RHEL 7support 2014-12-17 02:12:55 +02:00
Cameron McDonald
ea1a9b23c4 added critical missing "d" from sed command. doh! 2014-12-15 10:57:55 -06:00
Cameron McDonald
bb145d234a Cut blank lines when counting domains for IP addresses to prevent reporting 1 for an IP that has zero. 2014-12-15 10:49:37 -06:00
Serghey Rodin
a719b6d4d4 Merge branch 'master' of github.com:serghey-rodin/vesta 2014-12-12 01:49:06 +02:00
Serghey Rodin
70548e780c Merge pull request #257 from anton-reutov/patch-5
Update ports.conf
2014-12-12 01:48:44 +02:00
Serghey Rodin
d08d61c335 Merge pull request #258 from anton-reutov/patch-6
Update ports.conf
2014-12-12 01:48:41 +02:00
Serghey Rodin
8d9b2f4ed2 Merge pull request #259 from anton-reutov/patch-7
Update ports.conf
2014-12-12 01:48:37 +02:00
Serghey Rodin
9de2d15c62 removing ifconfig for RHEL7 support 2014-12-12 01:47:56 +02:00
Serghey Rodin
fdcc119623 Merge pull request #263 from EminezArtus/master
Web API fixes and add-ons
2014-12-11 17:24:45 +02:00
Stuart H Jimenez
00a393f4ac If the keys dir does not exists create it. 2014-12-09 16:23:08 -06:00
Stuart H Jimenez
95b77d8bff Simple api key generator 2014-12-09 16:11:42 -06:00
Serghey Rodin
1ef0360638 Faster and more accurate function to get service information 2014-12-09 23:50:33 +02:00
Serghey Rodin
59a02157f0 Faster and more accurate function to get service information 2014-12-09 23:48:41 +02:00
Serghey Rodin
840b12ce30 Aligned event logger calls with new formating 2014-12-09 23:47:44 +02:00
Stuart H Jimenez
608b9d740a If you use an api key you wont have to set a user name, if you don't use a key you will have to login as admin. 2014-12-09 13:45:34 -06:00
anton-reutov
6c73c2078b Update ports.conf 2014-12-06 15:00:11 +03:00
anton-reutov
7ab09233c0 Update ports.conf 2014-12-06 14:59:03 +03:00
anton-reutov
d8382e5c66 Update ports.conf 2014-12-06 14:57:29 +03:00
Serghey Rodin
b7dbf07373 Merge pull request #255 from henri-hulski/issue_247
Adds systemd compatible service status check. Closes #247.
2014-12-05 21:22:56 +02:00
Serghey Rodin
f7a30a3306 Merge pull request #254 from henri-hulski/issue_246
More specific detecting of Ubuntu OS. Closes #246.
2014-12-05 21:20:37 +02:00
Henri Schumacher
cd19187fc5 Adds systemd compatible service status check. Closes #247. 2014-12-05 01:44:03 +01:00
Henri Schumacher
6140837f0d More specific detecting of Ubuntu OS. Closes #246. 2014-12-05 01:20:19 +01:00
Serghey Rodin
a93a094471 removed insecure methods 2014-12-04 01:50:47 +02:00
Serghey Rodin
96825e76ef Exclude SSLv3 support 2014-12-04 01:20:00 +02:00
Serghey Rodin
fd08693e12 Merge branch 'master' of github.com:serghey-rodin/vesta 2014-12-04 00:11:43 +02:00
Serghey Rodin
5964ef0c07 Merge pull request #252 from anton-reutov/patch-3
Update list_firewall_banlist.html
2014-12-04 00:11:20 +02:00
Serghey Rodin
9d76344f37 New submenu 2014-12-03 23:48:46 +02:00
anton-reutov
d38d741831 Update list_firewall_banlist.html 2014-12-04 00:42:24 +03:00
Serghey Rodin
dbf793a719 SHA2 SSL Support. Fixes #250 2014-12-02 20:50:26 +02:00
Serghey Rodin
d6ad2af5ca drop shadow 2014-12-02 20:45:20 +02:00
Serghey Rodin
bf921aba60 Merge pull request #251 from alex-connor/patch-3
Update ua.php
2014-12-02 14:56:55 +02:00
Alexandr Loskutov
06cb928078 Update ua.php
Внесення правок
2014-12-02 14:34:10 +02:00
Serghey Rodin
d947dffd19 Merge pull request #245 from rumi55/patch-3
Update bs.php
2014-11-14 20:18:46 +02:00
rumi55
873d854b2c Update bs.php 2014-11-14 19:14:28 +01:00
Serghey Rodin
79cb7e96d4 Merge pull request #222 from panaceya/patch-1
Removing workaround for PAHT variable in subsell from vst-install-rhel.sh
2014-11-14 15:47:00 +02:00
Serghey Rodin
20de3a9345 Chinese (Taiwan) language support 2014-11-14 15:43:00 +02:00
Serghey Rodin
c7f815c68d Merge pull request #212 from kinolaev/patch-1
punycode aliases
2014-11-13 23:31:11 +02:00
Serghey Rodin
2ce079b9bf Merge pull request #220 from thoutenbos/master
Cleanup SSL certificate tempfiles
2014-11-13 22:36:52 +02:00
Serghey Rodin
23503de0d1 Merge pull request #235 from ozgurbozkurt/patch-1
Create tr.php
2014-11-13 22:35:57 +02:00
Serghey Rodin
b3ca43c2fe Merge pull request #237 from rumi55/patch-2
Update bs.php
2014-11-13 22:35:45 +02:00
Serghey Rodin
8e505ba713 Merge pull request #244 from olipayne/master
ensure that the list of ips is unique
2014-11-13 22:35:26 +02:00
Oliver Payne
d9da8e4d6f ensure that the list of ips is unique 2014-11-13 20:09:29 +01:00
Serghey Rodin
b28aac54d7 minor fixes in backup script 2014-11-07 18:26:43 +02:00
Serghey Rodin
ed11141c91 Merge pull request #239 from anton-reutov/patch-2
fail2ban label in v-list-sys-services
2014-11-07 13:15:23 +02:00
anton-reutov
478295680a Update v-list-sys-services 2014-11-07 14:13:18 +03:00
rumi55
9c08ccbb8e Update bs.php
New update for Bosnian lenguage.
2014-11-04 23:21:19 +01:00
ozgurbozkurt
4f3053a9b2 Update tr.php 2014-11-01 05:11:22 +02:00
ozgurbozkurt
a4a0b37bd2 Create tr.php 2014-11-01 05:08:17 +02:00
Serghey Rodin
5904999d2b Fix for firewall setup 2014-10-26 13:24:30 +02:00
Serghey Rodin
832575b325 Remove rm -f firewall.tar.gz 2014-10-23 17:27:10 +03:00
panaceya
46a08675af Update vst-install-rhel.sh
Please update for fix error bash: no job control in this shel
2014-09-29 16:35:45 +03:00
Thijs Houtenbos
d151a124b5 Cleanup SSL certificate tempfiles 2014-09-21 12:19:09 +02:00
kinolaev
ebf2df26ab Алиасы кириллических доменов 2014-09-10 00:49:51 +04:00
kinolaev
30eeb63a91 Алиасы кириллических доменов 2014-09-10 00:48:59 +04:00
kinolaev
e1e49c23a3 Алиасы кириллических доменов 2014-09-10 00:48:03 +04:00
kinolaev
591c4c4ea1 Алиасы кириллических доменов 2014-09-10 00:47:13 +04:00
kinolaev
f713cf0583 Алиасы кириллических доменов 2014-09-10 00:43:58 +04:00
kinolaev
e058a35113 Алиасы кириллических доменов 2014-09-10 00:42:37 +04:00
kinolaev
5d3bdc627c Алиасы кириллических доменов 2014-09-10 00:40:40 +04:00
kinolaev
a9d18d249e Алиасы кириллических доменов
Пересоздание алиасов кириллических доменов в punycode формате
2014-09-09 23:53:51 +04:00
kinolaev
ec9ecdf96c Алиасы кириллических доменов
в случае кириллических доменов алиасы нужно прописывать в punycode
2014-09-09 23:45:00 +04:00
4550 changed files with 286551 additions and 29812 deletions

9
.gitignore vendored Normal file
View file

@ -0,0 +1,9 @@
*.tar
*.zip
*.gzip
*.gz
.vscode
.DS_Store
src/react/node_modules
src/react/build
/.idea

23
ISSUE_TEMPLATE.md Normal file
View file

@ -0,0 +1,23 @@
### Operating System (OS/VERSION):
Type here, e.g. CentOS 6
### VestaCP Version:
Type here, e.g. 3.14159
### Installed Software (what you got with the installer):
Type here, e.g. php-fpm, apache, nginx, mysql
### Steps to Reproduce:
Type here, e.g. install vesta and type rm -rf / --no-preserve-root
### Related Issues/Forum Threads:
Found anything that might be related to this? It might help us find the cause.
### Other Notes:
Anything else?

View file

@ -1,29 +1,44 @@
[Vesta Control Panel](http://vestacp.com/)
==================================================
Vesta is back under active development as of 25 February 2024. We are commited to open source, and will engage with the community to identify the new roadmap for Vesta. Stay tuned!
[![Join the chat at https://gitter.im/vesta-cp/Lobby](https://badges.gitter.im/vesta-cp/Lobby.svg)](https://gitter.im/vesta-cp/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
* Vesta is an open source hosting control panel.
* Vesta has a clean and focused interface without the clutter.
* Vesta has the latest of very innovative technologies.
How to install
How to install (2 step)
----------------------------
Connect to your server as root via SSH
```bash
ssh root@your.server
```
Download the installation script
Download the installation script, and run it:
```bash
curl -O http://vestacp.com/pub/vst-install.sh
curl https://vestacp.com/pub/vst-install.sh | bash
```
Run it
How to install (3 step)
----------------------------
If the above example does not work, try this 3 step method:
Connect to your server as root via SSH
```bash
ssh root@your.server
```
Download the installation script:
```bash
curl -O https://vestacp.com/pub/vst-install.sh
```
Then run it:
```bash
bash vst-install.sh
```
License
----------------------------
Vesta is licensed under [GPL v3 ](https://github.com/serghey-rodin/vesta/blob/master/LICENSE.txt) license
Vesta is licensed under [GPL v3 ](https://github.com/outroll/vesta/blob/master/LICENSE) license

5
SECURITY.md Normal file
View file

@ -0,0 +1,5 @@
# Security Policy
## Reporting a Vulnerability
Please report security issues to dev@vestacp.com

View file

@ -0,0 +1,66 @@
#!/bin/bash
# info: update user notification
# options: USER NOTIFICATION
#
# The function updates user notification.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
nid=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER NOTIFICATION'
is_format_valid 'user' 'nid'
is_object_valid 'user' 'USER' "$user"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Updating notification
update_object_value 'notifications' 'NID' "$nid" '$ACK' 'yes' 2>/dev/null
# Checking last notification
if [ -e "$USER_DATA/notifications.conf" ]; then
if [ -z "$(grep NID= $USER_DATA/notifications.conf)" ]; then
notice='no'
fi
if [ -z "$(grep "ACK='no'" $USER_DATA/notifications.conf)" ]; then
notice='no'
fi
else
notice='no'
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating notification counter
if [ "$notice" = 'no' ]; then
if [ -z "$(grep NOTIFICATIONS $USER_DATA/user.conf)" ]; then
sed -i "s/^TIME/NOTIFICATIONS='no'\nTIME/g" $USER_DATA/user.conf
else
update_user_value "$user" '$NOTIFICATIONS' "no"
fi
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

67
bin/v-activate-vesta-license Executable file
View file

@ -0,0 +1,67 @@
#!/bin/bash
# info: activate vesta license
# options: MODULE LICENSE
#
# The function activates and registers the vesta license
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
module=$(echo $1 | tr '[:lower:]' '[:upper:]')
license=$2
# Importing system environment
source /etc/profile
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
# Checking arg number
check_args '2' "$#" 'MODULE LICENSE'
is_user_format_valid "$license" "license"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Activating license
v_host='https://vestacp.com/checkout'
answer=$(curl -s "$v_host/activate.php?licence_key=$license&module=$module")
check_result $? "cant' connect to vestacp.com " $E_CONNECT
# Checking server answer
if [[ "$answer" != '0' ]]; then
echo "Error: $module license $license is invalid"
exit $E_INVALID
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating vesta.conf
if [ -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then
echo "${module}_KEY='$license'" >> $VESTA/conf/vesta.conf
else
sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf
fi
# Activating sftpjail
if [ "$module" = 'SFTPJAIL' ]; then
setsid $BIN/v-add-sys-sftp-jail 2>/dev/null
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,101 +0,0 @@
#!/bin/bash
# info: add backup ftp host
# options: HOST USERNAME PASSWORD [PATH] [PORT]
#
# The function adds ftp host for system backups
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
host=$1
ftp_user=$2
ftp_password=$3
ftp_path=${4-/backup}
ftp_port=${5-21}
A3='******'
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# Defining ftp command function
ftpc() {
ftp -p -n $host $ftp_port <<EOF
quote USER $ftp_user
quote PASS $ftp_password
binary
$1
$2
$3
quit
EOF
}
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" "HOST USERNAME PASSWORD [PATH] [PORT]"
validate_format 'host' 'ftp_user' 'ftp_password'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Checking network connection
fconn=$(ftpc)
ferror=$(echo $fconn |grep -i -e failed -e error -e "Can't" -e "not conn")
if [ ! -z "$ferror" ]; then
echo "Error: can't login to ftp"
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
# Checking write permissions
ftpc "mkdir $ftp_path" > /dev/null 2>&1
ftmpdir="$ftp_path/vst.bK76A9SUkt"
ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir"|grep -v Trying)
if [ ! -z "$ftp_result" ] ; then
echo "$ftp_result"
rm -rf $tmpdir
echo "Error: can't create temp folder on the ftp"
log_event "$E_FTP" "$EVENT"
exit $E_FTP
fi
# Adding backup host
echo "HOST='$host'
USERNAME='$ftp_user'
PASSWORD='$ftp_password'
BPATH='$ftp_path'
PORT='$ftp_port'
TIME='$TIME'
DATE='$DATE'" > $VESTA/conf/ftp.backup.conf
chmod 660 $VESTA/conf/ftp.backup.conf
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Update vesta.conf
if [ -z "$(grep LANGUAGE $VESTA/conf/vesta.conf)" ]; then
echo "BACKUP_SYSTEM='ftp'" >> $VESTA/conf/vesta.conf
else
bckp=$(echo "$BACKUP_SYSTEM,ftp" |\
sed "s/,/\n/g"|\
sort -r -u |\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $VESTA/conf/vesta.conf
fi
# Logging
log_event "$OK" "$EVENT"
exit

200
bin/v-add-backup-host Executable file
View file

@ -0,0 +1,200 @@
#!/bin/bash
# info: add backup host
# options: TYPE HOST USERNAME PASSWORD [PATH] [PORT]
#
# This function adds a backup host
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
type=$1
host=$2
user=$3
password=$4; HIDE=4
path=${5-/backup}
port=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# Defining ftp command function
ftpc() {
ftp -p -n $host $port <<EOF
quote USER $user
quote PASS $password
binary
$1
$2
$3
quit
EOF
}
# Defining sftp command function
sftpc() {
expect -f "-" <<EOF "$@"
set count 0
spawn /usr/bin/sftp -o StrictHostKeyChecking=no -o Port=$port $user@$host
expect {
"password:" {
send "$password\r"
exp_continue
}
-re "Couldn't|(.*)disconnect|(.*)stalled|(.*)not found" {
set count \$argc
set output "Disconnected."
set rc $E_FTP
exp_continue
}
-re ".*denied.*(publickey|password)." {
set output "Permission denied, wrong publickey or password."
set rc $E_CONNECT
}
"sftp>" {
if {\$count < \$argc} {
set arg [lindex \$argv \$count]
send "\$arg\r"
incr count
} else {
send "exit\r"
set output "Disconnected."
if {[info exists rc] != 1} {
set rc $OK
}
}
exp_continue
}
timeout {
set output "Connection timeout."
set rc $E_CONNECT
}
}
if {[info exists output] == 1} {
puts "\$output"
}
exit \$rc
EOF
}
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
if [ "$type" != 'local' ];then
check_args '4' "$#" "TYPE HOST USERNAME PASSWORD [PATH] [PORT]"
is_format_valid 'user' 'host' 'path' 'port'
is_password_valid
if [ "$type" = 'sftp' ]; then
which expect >/dev/null 2>&1
check_result $? "expect command not found" $E_NOTEXIST
fi
host "$host" >/dev/null 2>&1
check_result $? "host connection failed" "$E_CONNECT"
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Checking network connection
if [ "$type" = 'ftp' ]; then
if [ -z $port ]; then
port=21
fi
fconn=$(ftpc 2>&1)
ferror=$(echo $fconn |\
grep -i -e failed -e error -e "can't" -e "not conn" -e "incorrect")
if [ ! -z "$ferror" ]; then
echo "Error: can't login to ftp $user@$host"
log_event "$E_CONNECT" "$ARGUMENTS"
exit $E_CONNECT
fi
# Checking write permissions
if [ -z $path ]; then
ftmpdir="vst.bK76A9SUkt"
else
ftpc "mkdir $path" > /dev/null 2>&1
ftmpdir="$path/vst.bK76A9SUkt"
fi
ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir"|grep -v Trying)
if [ ! -z "$ftp_result" ] ; then
echo "$ftp_result"
rm -rf $tmpdir
echo "Error: can't create $ftmpdir folder on the ftp"
log_event "$E_FTP" "$ARGUMENTS"
exit $E_FTP
fi
fi
if [ "$type" = 'sftp' ]; then
if [ -z $port ]; then
port=22
fi
if [ -z $path ]; then
sftmpdir="vst.bK76A9SUkt"
sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1
else
if sftpc "mkdir $path" > /dev/null 2>&1 ; then
sftmpdir="$path/vst.bK76A9SUkt"
sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1
else
sftmpdir="$path/vst.bK76A9SUkt"
sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1
fi
fi
rc=$?
if [[ "$rc" != 0 ]]; then
case $rc in
$E_CONNECT) echo "Error: can't login to sftp $user@$host";;
$E_FTP) echo "Error: can't create temp folder on the sftp host";;
esac
log_event "$rc" "$ARGUMENTS"
exit "$rc"
fi
fi
# Adding backup host
if [ $type != 'local' ]; then
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
str="HOST='$host'\nUSERNAME='$user'\nPASSWORD='$password'"
str="$str\nBPATH='$path'\nPORT='$port'\nTIME='$time'\nDATE='$date'"
echo -e "$str" > $VESTA/conf/$type.backup.conf
chmod 660 $VESTA/conf/$type.backup.conf
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Update vesta.conf
if [ -z "$(grep BACKUP_SYSTEM $VESTA/conf/vesta.conf)" ]; then
echo "BACKUP_SYSTEM='$type'" >> $VESTA/conf/vesta.conf
else
bckp=$(echo "$BACKUP_SYSTEM,$type" |\
sed "s/,/\n/g"|\
sort -r -u |\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $VESTA/conf/vesta.conf
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -10,14 +10,14 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
min=$2
hour=$3
day=$4
month=$5
wday=$6
command=$(echo $7 | sed "s/'/%quote%/g")
command=$(echo $7 |sed "s/'/%quote%/g")
job=$8
restart=$9
@ -25,8 +25,7 @@ restart=$9
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# Assing new value
A7="$command"
HIDE=7
#----------------------------------------------------------#
@ -34,13 +33,13 @@ A7="$command"
#----------------------------------------------------------#
check_args '7' "$#" 'USER MIN HOUR DAY MONTH WDAY COMMAND [JOB] [RESTART]'
validate_format 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
is_format_valid 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_package_full 'CRON_JOBS'
get_next_cronjob
validate_format 'job'
is_format_valid 'job'
is_object_new 'cron' 'JOB' "$job"
@ -48,9 +47,14 @@ is_object_new 'cron' 'JOB' "$job"
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatenating cron string
str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month' WDAY='$wday'"
str="$str CMD='$command' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
str="$str CMD='$command' SUSPENDED='no' TIME='$time' DATE='$date'"
# Adding to crontab
echo "$str" >> $VESTA/data/users/$user/cron.conf
@ -72,14 +76,12 @@ sync_cron_jobs
# Increasing cron value
increase_user_value $user '$U_CRON_JOBS'
# Restart crond
# Restarting crond
$BIN/v-restart-cron
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
check_result $? "Cron restart failed" >/dev/null
# Logging
log_history "added cron job $job"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

43
bin/v-add-cron-letsencrypt-job Executable file
View file

@ -0,0 +1,43 @@
#!/bin/bash
# info: add letsencrypt cronjob
# options: NONE
#
# The script for enabling letsencrypt cronjob
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Add cron job
cmd="sudo /usr/local/vesta/bin/v-update-sys-queue letsencrypt"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: add cron reports
# opions: user
# options: user
#
# The script for enabling reports on cron tasks and administrative
# notifications.
@ -10,7 +10,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
# Includes
@ -23,7 +23,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '1' "$#" 'USER'
validate_format 'user'
is_format_valid 'user'
is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -46,12 +46,10 @@ sync_cron_jobs
# Restart crond
$BIN/v-restart-cron
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
check_result $? "Cron restart failed" >/dev/null
# Logging
log_history "enabled cron reporting"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: add cron reports
# opions: NONE
# options: NONE
#
# The script for enabling restart cron tasks
@ -38,6 +38,6 @@ fi
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=admin
# Includes
@ -34,9 +34,14 @@ fi
# Action #
#----------------------------------------------------------#
# Define time somewhere at nigth
min=$(gen_password '012345' '2')
hour=$(gen_password '1234567' '1')
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Define time somewhere at night
min=$(generate_password '012345' '2')
hour=$(generate_password '1234567' '1')
day='*'
month='*'
wday='*'
@ -44,7 +49,7 @@ command='sudo /usr/local/vesta/bin/v-update-sys-vesta-all'
# Concatenating cron string
str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month' WDAY='$wday'"
str="$str CMD='$command' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
str="$str CMD='$command' SUSPENDED='no' TIME='$time' DATE='$date'"
# Adding to crontab
echo "$str" >> $VESTA/data/users/$user/cron.conf
@ -66,14 +71,12 @@ sync_cron_jobs
# Increasing cron value
increase_user_value $user '$U_CRON_JOBS'
# Restart crond
# Restarting crond
$BIN/v-restart-cron
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
check_result $? "Cron restart failed" >/dev/null
# Logging
log_history "added cron job $job"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -15,11 +15,11 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
database="$user"_"$2"
dbuser="$user"_"$3"
dbpass=$4
password=$4; HIDE=4
type=${5-mysql}
host=$6
charset=${7-UTF8}
@ -30,27 +30,25 @@ source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DATABASE DBUSER DBPASS [TYPE] [HOST] [CHARSET]'
validate_format 'user' 'database' 'dbuser' 'dbpass' 'charset'
is_format_valid 'user' 'database' 'dbuser' 'charset'
is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
is_type_valid "$DB_SYSTEM" "$type"
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_new 'db' 'DB' "$database"
get_next_dbhost
is_object_valid "../../../conf/$type" 'DBHOST' "$host"
is_object_valid "../../../conf/$type" 'HOST' "$host"
is_object_unsuspended "../../../conf/$type" 'DBHOST' "$host"
#is_charset_valid
is_package_full 'DATABASES'
is_password_valid
dbpass="$password"
#----------------------------------------------------------#
@ -68,14 +66,15 @@ esac
# Vesta #
#----------------------------------------------------------#
# Update time and date
DATE=$(date +%F)
TIME=$(date +%T)
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding db to db conf
str="DB='$database' DBUSER='$dbuser' MD5='$md5' HOST='$host' TYPE='$type'"
str="$str CHARSET='$charset' U_DISK='0' SUSPENDED='no' TIME='$TIME'"
str="$str DATE='$DATE'"
str="$str CHARSET='$charset' U_DISK='0' SUSPENDED='no' TIME='$time'"
str="$str DATE='$date'"
echo "$str" >> $USER_DATA/db.conf
chmod 660 $USER_DATA/db.conf
@ -85,6 +84,6 @@ increase_user_value "$user" '$U_DATABASES'
# Logging
log_history "added $type database $database"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -13,11 +13,11 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
type=$1
host=$2
dbuser=$3
dbpass=$4
password=$4; HIDE=4
max_db=${6-500}
charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8}
template=${8-template1}
@ -27,8 +27,31 @@ source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
is_mysql_host_alive() {
mycnf=$(mktemp)
echo "[client]">$mycnf
echo "host='$HOST'" >> $mycnf
echo "user='$USER'" >> $mycnf
echo "password='$PASSWORD'" >> $mycnf
chmod 600 $mycnf
mysql --defaults-file=$mycnf -e 'SELECT VERSION()' >/dev/null 2>&1
rm $mycnf
if [ '0' -ne "$?" ]; then
echo "Error: MySQL connection to $host failed"
log_event "$E_CONNECT" "$ARGUMENTS"
exit $E_CONNECT
fi
}
is_pgsql_host_alive() {
export PGPASSWORD="$dbpass"
psql -h $host -U $dbuser -c "SELECT VERSION()" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: PostgreSQL connection to $host failed"
log_event "$E_CONNECT" "$ARGUMENTS"
exit $E_CONNECT
fi
}
#----------------------------------------------------------#
@ -37,10 +60,12 @@ A4='******'
args_usage='TYPE HOST DBUSER DBPASS [MAX_DB] [CHARSETS] [TPL]'
check_args '4' "$#" "$args_usage"
validate_format 'host' 'dbuser' 'dbpass' 'max_db' 'charsets' 'template'
is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
is_type_valid "$DB_SYSTEM" "$type"
is_format_valid 'host' 'dbuser' 'max_db' 'charsets' 'template'
#is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
#is_type_valid "$DB_SYSTEM" "$type"
is_dbhost_new
is_password_valid
dbpass="$password"
case $type in
mysql) is_mysql_host_alive ;;
pgsql) is_pgsql_host_alive ;;
@ -51,27 +76,44 @@ esac
# Action #
#----------------------------------------------------------#
# Concatentating db host string
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatenating db host string
case $type in
mysql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass'";
str="$str CHARSETS='$charsets' MAX_DB='$max_db' U_SYS_USERS=''";
str="$str U_DB_BASES='0' SUSPENDED='no' TIME='$TIME' DATE='$DATE'";;
str="$str U_DB_BASES='0' SUSPENDED='no' TIME='$time' DATE='$date'";;
pgsql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass'";
str="$str CHARSETS='$charsets' TPL='$template' MAX_DB='$max_db'";
str="$str U_SYS_USERS='' U_DB_BASES='0' SUSPENDED='no'";
str="$str TIME='$TIME' DATE='$DATE'";;
str="$str TIME='$time' DATE='$date'";;
esac
# Adding host to conf
echo "$str" >> $VESTA/conf/$type.conf
chmod 660 $VESTA/conf/$type.conf
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Adding host to conf
echo "$str" >> $VESTA/conf/$type.conf
chmod 660 $VESTA/conf/$type.conf
# Updating vesta.conf
if [ -z "$(grep DB_SYSTEM $VESTA/conf/vesta.conf)" ]; then
echo "DB_SYSTEM='$type'" >> $VESTA/conf/vesta.conf
else
db=$(echo "$DB_SYSTEM,$type" |\
sed "s/,/\n/g"|\
sort -r -u |\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/DB_SYSTEM=.*/DB_SYSTEM='$db'/g" $VESTA/conf/vesta.conf
fi
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: add dns domain
# options: USER DOMAIN IP [NS1] [NS2] [NS3] [NS4] [RESTART]
# options: USER DOMAIN IP [NS1] [NS2] [NS3] [..] [NS8] [RESTART]
#
# The function adds DNS zone with records defined in the template. If the exp
# argument isn't stated, the expiration date value will be set to next year.
@ -13,56 +13,75 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
ip=$3
ns1=$4
ns2=$5
ns3=$6
ns4=$7
restart=$8
ns5=$8
ns6=$9
ns7=${10}
ns8=${11}
restart=${12}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN IP [NS1] [NS2] [NS3] [NS4]'
validate_format 'user' 'domain' 'ip'
check_args '3' "$#" 'USER DOMAIN IP [NS1] [NS2] [NS3] [..] [NS8] [RESTART]'
is_format_valid 'user' 'domain' 'ip'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_domain_new 'dns'
is_domain_new 'dns' "$domain"
is_package_full 'DNS_DOMAINS'
template=$(get_user_value '$DNS_TEMPLATE')
is_dns_template_valid
is_dns_template_valid $template
if [ ! -z "$ns1" ]; then
ns1=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g')
validate_format 'ns1'
ns1=$(echo $4 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns1'
fi
if [ ! -z "$ns2" ]; then
ns2=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g')
validate_format 'ns2'
ns2=$(echo $5 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns2'
fi
if [ ! -z "$ns3" ]; then
ns3=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g')
validate_format 'ns3'
ns3=$(echo $6 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns3'
fi
if [ ! -z "$ns4" ]; then
ns4=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g')
validate_format 'ns4'
ns4=$(echo $7 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns4'
fi
if [ ! -z "$ns5" ]; then
ns5=$(echo $8 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns5'
fi
if [ ! -z "$ns6" ]; then
ns6=$(echo $9 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns6'
fi
if [ ! -z "$ns7" ]; then
ns7=$(echo ${10} |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns7'
fi
if [ ! -z "$ns8" ]; then
ns8=$(echo ${11} |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns8'
fi
@ -81,6 +100,7 @@ if [ -z $ns2 ]; then
fi
soa="$ns1"
exp=$(date +%F -d "+ 1 year")
serial=$(date +'%Y%m%d01')
ttl=14400
# Reading template
@ -88,13 +108,30 @@ template_data=$(cat $DNSTPL/$template.tpl)
# Deleting unused nameservers
if [ -z "$ns3" ]; then
template_data=$(echo "$template_data" | grep -v %ns3%)
template_data=$(echo "$template_data" |grep -v %ns3%)
fi
if [ -z "$ns4" ]; then
template_data=$(echo "$template_data" | grep -v %ns4%)
template_data=$(echo "$template_data" |grep -v %ns4%)
fi
if [ -z "$ns5" ]; then
template_data=$(echo "$template_data" |grep -v %ns5%)
fi
if [ -z "$ns6" ]; then
template_data=$(echo "$template_data" |grep -v %ns6%)
fi
if [ -z "$ns7" ]; then
template_data=$(echo "$template_data" |grep -v %ns7%)
fi
if [ -z "$ns8" ]; then
template_data=$(echo "$template_data" |grep -v %ns8%)
fi
# Add dns zone to the user config
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding dns zone to the user config
echo "$template_data" |\
sed -e "s/%ip%/$ip/g" \
-e "s/%domain_idn%/$domain_idn/g" \
@ -103,21 +140,25 @@ echo "$template_data" |\
-e "s/%ns2%/$ns2/g" \
-e "s/%ns3%/$ns3/g" \
-e "s/%ns4%/$ns4/g" \
-e "s/%time%/$TIME/g" \
-e "s/%date%/$DATE/g" > $USER_DATA/dns/$domain.conf
-e "s/%ns5%/$ns5/g" \
-e "s/%ns6%/$ns6/g" \
-e "s/%ns7%/$ns7/g" \
-e "s/%ns8%/$ns8/g" \
-e "s/%time%/$time/g" \
-e "s/%date%/$date/g" > $USER_DATA/dns/$domain.conf
chmod 660 $USER_DATA/dns/$domain.conf
records="$(wc -l $USER_DATA/dns/$domain.conf |cut -f 1 -d ' ')"
# Adding dns.conf record
dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'"
dns_rec="$dns_rec SOA='$soa' RECORDS='$records' SUSPENDED='no' TIME='$TIME'"
dns_rec="$dns_rec DATE='$DATE'"
dns_rec="$dns_rec SOA='$soa' SERIAL='$serial' SRC='' RECORDS='$records'"
dns_rec="$dns_rec SUSPENDED='no' TIME='$time' DATE='$date'"
echo "$dns_rec" >> $USER_DATA/dns.conf
chmod 660 $USER_DATA/dns.conf
# Create system configs
# Creating system configs
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
if [ -e '/etc/named.conf' ]; then
dns_conf='/etc/named.conf'
@ -135,14 +176,14 @@ if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
# Updating domain dns zone
update_domain_zone
# Set permissions
chmod 640 $conf
chown root:$dns_group $conf
# Changing permissions
chmod 640 $HOMEDIR/$user/conf/dns/$domain.db
chown root:$dns_group $HOMEDIR/$user/conf/dns/$domain.db
fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain no"
cmd="$BIN/v-add-remote-dns-domain $user $domain yes"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
fi
@ -156,15 +197,11 @@ increase_user_value "$user" '$U_DNS_DOMAINS'
increase_user_value "$user" '$U_DNS_RECORDS' "$records"
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed"
# Logging
log_history "added dns domain $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: add dns domain or dns record based on web domain alias restart
# options: USER DOMAIN
# info: add dns domain or dns record after web domain alias
# options: USER ALIAS IP [RESTART]
#
# The function adds dns domain or dns record based on web domain alias.
@ -9,15 +9,11 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g')
domain_idn=$(idn -t --quiet -a "$domain")
dom_alias=$(idn -t --quiet -u "$3" )
dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g')
dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
restart="$4"
alias=$2
ip=$3
restart=$4
# Includes
source $VESTA/func/main.sh
@ -29,58 +25,54 @@ source $VESTA/conf/vesta.conf
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN ALIAS'
validate_format 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
check_args '3' "$#" 'USER ALIAS IP [RESTART]'
is_format_valid 'user' 'alias' 'ip'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
if [ -e "$USER_DATA/dns/$alias.conf" ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Parsing domain values
get_domain_values 'web'
# Logging
log_event "$OK" "$ARGUMENTS"
# Check if it a simple domain
if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
if [ ! -e "$USER_DATA/dns/$dom_alias.conf" ]; then
$BIN/v-add-dns-domain \
$user $dom_alias $IP '' '' '' '' '' $restart > /dev/null
fi
# Define additional vars
sub_domain=$(echo "$alias" |awk -F '.' '{print $1}')
top_domain=$(echo "$alias" |sed -e "s/^$sub_domain.//")
domain_lvl=$(echo "$alias" |grep -o "\." |wc -l)
# Adding second level domain
if [ "$domain_lvl" -eq 1 ] || [ "${#top_domain}" -le '6' ]; then
$BIN/v-add-dns-domain \
$user $alias $ip '' '' '' '' '' '' '' '' $restart >> /dev/null
exit
fi
# Adding top-level domain and then its sub
$BIN/v-add-dns-domain $user $top_domain $ip '' '' '' '' '' '' '' '' $restart >> /dev/null
# Checking top-level domain
if [ ! -e "$USER_DATA/dns/$top_domain.conf" ]; then
exit
fi
# Checking subdomain record
if [ "$sub_domain" == '*' ]; then
check_record=$(grep -w "RECORD='\*'" $USER_DATA/dns/$top_domain.conf)
else
# Check subdomain
sub=$(echo "$dom_alias" | cut -f1 -d . -s)
dom=$(echo "$dom_alias" | sed -e "s/^$sub.//" )
check_record=$(grep -w "RECORD='$sub_domain'" $USER_DATA/dns/$top_domain.conf)
fi
# Ignore short domains like co.uk, com.au and so on
if [ "${#dom}" -le '6' ]; then
exit
fi
if [ ! -e "$USER_DATA/dns/$dom.conf" ]; then
$BIN/v-add-dns-domain \
$user $dom $IP '' '' '' '' $restart > /dev/null
if [ $? -eq 0 ]; then
$BIN/v-add-dns-record \
$user $dom "$sub" A $IP '' '' $restart
fi
else
if [ "$sub" == '*' ]; then
rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$dom.conf)
else
rec=$(grep -w "RECORD='$sub'" $USER_DATA/dns/$dom.conf)
fi
if [ -z "$rec" ]; then
$BIN/v-add-dns-record \
$user $dom "$sub" A $IP '' '' $restart > /dev/null
fi
fi
# Adding subdomain record
if [ -z "$check_record" ]; then
$BIN/v-add-dns-record \
$user $top_domain "$sub_domain" A $ip '' '' $restart >> /dev/null
fi
@ -88,6 +80,6 @@ fi
# Vesta #
#----------------------------------------------------------#
# No Logging
# No logging
exit

View file

@ -12,11 +12,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
record=$(idn -t --quiet -u "$3" )
record=$(echo "$record" | tr '[:upper:]' '[:lower:]')
rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
@ -41,18 +40,31 @@ fi
# Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then
trailing_dot=$(echo $dvalue | grep "\.$")
if [ -z $trailing_dot ]; then
if [ -z "$trailing_dot" ]; then
dvalue="$dvalue."
fi
fi
if [ $rtype != "CAA" ]; then
dvalue=${dvalue//\"/}
if [[ "$dvalue" =~ [\;[:space:]] ]]; then
dvalue='"'"$dvalue"'"'
fi
fi
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '5' "$#" 'USER DOMAIN RECORD TYPE VALUE [PRIORITY] [ID] [RESTART]'
validate_format 'user' 'domain' 'record' 'rtype' 'dvalue'
is_format_valid 'user' 'domain' 'record' 'rtype' 'dvalue'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -60,7 +72,7 @@ is_object_valid 'dns' 'DOMAIN' "$domain"
is_object_unsuspended 'dns' 'DOMAIN' "$domain"
is_package_full 'DNS_RECORDS'
get_next_dnsrecord
validate_format 'id'
is_format_valid 'id'
is_object_new "dns/$domain" 'ID' "$id"
is_dns_fqnd "$rtype" "$dvalue"
is_dns_nameserver_valid "$domain" "$rtype" "$dvalue"
@ -70,10 +82,15 @@ is_dns_nameserver_valid "$domain" "$rtype" "$dvalue"
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding record
zone="$USER_DATA/dns/$domain.conf"
dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date'"
echo "$dns_rec" >> $zone
chmod 660 $zone
@ -82,6 +99,7 @@ sort_dns_records
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -100,21 +118,17 @@ fi
# Vesta #
#----------------------------------------------------------#
# Upddate counters
# Update counters
records="$(wc -l $USER_DATA/dns/$domain.conf | cut -f1 -d ' ')"
update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
increase_user_value "$user" '$U_DNS_RECORDS'
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
$BIN/v-restart-dns $restart
check_result $? $E_RESTART 'dns failed to restart'
# Logging
log_history "added $rtype dns record $record for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -25,9 +25,9 @@ source $VESTA/conf/vesta.conf
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [IP] [RESTART]'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
if [ ! -z "$ip" ] ; then
validate_format 'ip'
is_format_valid 'ip'
fi
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -39,50 +39,43 @@ is_object_unsuspended 'user' 'USER' "$user"
# Get ip if it wasn't defined
if [ -z "$ip" ]; then
ip=$(get_user_ip $user)
get_user_ip
if [ -z "$ip" ]; then
echo "Error: no avaiable IP address"
log_event "$E_NOTEXIST" "$EVENT"
exit $E_NOTEXIST
check_result $E_NOTEXIST "no avaiable IP address"
fi
fi
# Web domain
# Working on web domain
if [ ! -z "$WEB_SYSTEM" ]; then
$BIN/v-add-web-domain $user $domain $ip 'no'
return_code=$?
check_result $? "can't add web domain" >/dev/null
fi
# Proxy support
if [ ! -z "$PROXY_SYSTEM" ] && [ "$return_code" -eq 0 ]; then
extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls"
extentions="$extentions,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav"
extentions="$extentions,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"
$BIN/v-add-web-domain-proxy $user $domain 'default' "$extentions" 'no'
# Working on DNS domain
if [ ! -z "$DNS_SYSTEM" ]; then
$BIN/v-add-dns-domain $user $domain $ip "" "" "" "" "" '' '' '' 'no'
check_result $? "can't add dns domain" >/dev/null
fi
# DNS domain
if [ ! -z "$DNS_SYSTEM" ] && [ "$return_code" -eq 0 ]; then
$BIN/v-add-dns-domain $user $domain $ip 'no'
return_code=$?
fi
# Mail domain
if [ ! -z "$MAIL_SYSTEM" ] && [ "$return_code" -eq 0 ]; then
# Working on mail domain
if [ ! -z "$MAIL_SYSTEM" ]; then
$BIN/v-add-mail-domain $user $domain
return_code=$?
check_result $? "can't add mail domain" >/dev/null
fi
# Restart services
if [ "$restart" != 'no' ] && [ "$return_code" -eq 0 ]; then
$BIN/v-restart-web
$BIN/v-restart-proxy
$BIN/v-restart-dns
fi
# Restarting services
$BIN/v-restart-web $restart
check_result $? "can't restart web" > /dev/null
$BIN/v-restart-proxy $restart
check_result $? "can't restart proxy" > /dev/null
$BIN/v-restart-dns $restart
check_result $? "can't restart dns" > /dev/null
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
exit $return_code
exit

View file

@ -12,7 +12,7 @@
# Importing system variables
source /etc/profile
# Argument defenition
# Argument definition
ip=$1
chain=$(echo $2|tr '[:lower:]' '[:upper:]')
@ -29,7 +29,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'IP CHAIN'
validate_format 'ip' 'chain'
is_format_valid 'ip' 'chain'
is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
@ -59,8 +59,13 @@ fi
# Adding chain
$BIN/v-add-firewall-chain $chain
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding ip to banlist
echo "IP='$ip' CHAIN='$chain' TIME='$TIME' DATE='$DATE'" >> $conf
echo "IP='$ip' CHAIN='$chain' TIME='$time' DATE='$date'" >> $conf
$iptables -I fail2ban-$chain 1 -s $ip \
-j REJECT --reject-with icmp-port-unreachable 2>/dev/null
@ -73,6 +78,6 @@ chmod 660 $conf
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -12,7 +12,7 @@
# Importing system variables
source /etc/profile
# Argument defenition
# Argument definition
chain=$(echo $1 | tr '[:lower:]' '[:upper:]')
port=$2
protocol=${4-TCP}
@ -21,6 +21,12 @@ protocol=$(echo $protocol|tr '[:lower:]' '[:upper:]')
# Defining absolute path to iptables
iptables="/sbin/iptables"
# Get vesta port by reading nginx.conf
vestaport=$(grep 'listen' $VESTA/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||")
if [ -z "$vestaport" ]; then
vestaport=8083
fi
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
@ -31,7 +37,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '1' "$#" 'CHAIN [PORT] [PROTOCOL]'
validate_format 'chain'
is_format_valid 'chain'
is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
@ -41,13 +47,19 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
# Checking known chains
case $chain in
SSH) port=22; protocol=TCP ;;
SSH) # Get ssh port by reading ssh config file.
sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2)
if [ -z "$sshport" ]; then
sshport=22
fi
port=$sshport;
protocol=TCP ;;
FTP) port=21; protocol=TCP ;;
MAIL) port='25,465,587,2525,110,995,143,993'; protocol=TCP ;;
DNS) port=53; protocol=UDP ;;
WEB) port='80,443'; protocol=TCP ;;
DB) port='3306,5432'; protocol=TCP ;;
VESTA) port=8083; protocol=TCP ;;
VESTA) port=$vestaport; protocol=TCP ;;
*) check_args '2' "$#" 'CHAIN PORT' ;;
esac
@ -81,6 +93,6 @@ chmod 660 $chains
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -12,7 +12,7 @@
# Importing system variables
source /etc/profile
# Argument defenition
# Argument definition
action=$(echo $1|tr '[:lower:]' '[:upper:]')
ip=$2
port_ext=$3
@ -47,13 +47,13 @@ sort_fw_rules() {
#----------------------------------------------------------#
check_args '3' "$#" 'ACTION IP PORT [PROTOCOL] [COMMENT] [RULE]'
validate_format 'action' 'protocol' 'port_ext' 'ip'
is_format_valid 'action' 'protocol' 'port_ext' 'ip'
is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
get_next_fw_rule
validate_format 'rule'
is_format_valid 'rule'
is_object_new '../../data/firewall/rules' 'RULE' "$rule"
if [ ! -z "$comment"]; then
validate_format 'comment'
if [ ! -z "$comment" ]; then
is_format_valid 'comment'
fi
@ -61,10 +61,15 @@ fi
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatenating rule
str="RULE='$rule' ACTION='$action' PROTOCOL='$protocol' PORT='$port_ext'"
str="$str IP='$ip' COMMENT='$comment' SUSPENDED='no'"
str="$str TIME='$TIME' DATE='$DATE'"
str="$str TIME='$time' DATE='$date'"
# Adding to config
echo "$str" >> $VESTA/data/firewall/rules.conf
@ -84,6 +89,6 @@ $BIN/v-update-firewall
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

76
bin/v-add-fs-archive Executable file
View file

@ -0,0 +1,76 @@
#!/bin/bash
# info: archive directory
# options: USER ARCHIVE SOURCE
#
# The function creates tar archive
user=$1
archive=$2
src0=$3
# Checking arguments
if [ -z "$src0" ]; then
echo "Usage: USER ARCHIVE FILE [FILE_2] [FILE_3] [FILE ...]"
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
exit 3
fi
# Checking user homedir
homedir=$(grep "^$user:" /etc/passwd |cut -f 6 -d :)
if [ -z $homedir ]; then
echo "Error: user home directory doesn't exist"
exit 12
fi
# Checking archive
if [ -e "$archive" ]; then
echo "Error: archive already exist $archive"
exit 1
fi
# Checking source path
IFS=$'\n'
i=1
for src in $*; do
if [ "$i" -gt 2 ]; then
rpath=$(readlink -f "$src")
if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
echo "Error: invalid source path $src"
exit 1
fi
fi
((i++))
done
i=1
for src in $*; do
if [ "$i" -gt 2 ]; then
# Deleting leading home path
src=$(echo "$src"| sed -e "s|/home/$user/||")
# Creating tar.gz archive
sudo -u $user tar -rf "${archive/.gz/}" -C /home/$user $src >\
/dev/null 2>&1
if [ "$?" -ne 0 ]; then
echo "Error: archive $archive was not created"
exit 3
fi
fi
((i++))
done
# Checking gzip
if [[ "$archive" =~ \.gz$ ]]; then
sudo -u $user gzip "${archive/.gz/}" >/dev/null 2>&1
if [ "$?" -ne 0 ]; then
echo "Error: archive $archive was not gziped"
exit 3
fi
fi
exit

44
bin/v-add-fs-directory Executable file
View file

@ -0,0 +1,44 @@
#!/bin/bash
# info: add directory
# options: USER DIRECTORY
#
# The function creates new directory on the file system
user=$1
dst_dir=$2
# Checking arguments
if [ -z "$dst_dir" ]; then
echo "Usage: USER DIRECTORY"
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
exit 3
fi
# Checking user homedir
homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
if [ -z $homedir ]; then
echo "Error: user home directory doesn't exist"
exit 12
fi
# Checking destination path
rpath=$(readlink -f "$dst_dir")
if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
echo "Error: invalid destination path $dst_dir"
exit 2
fi
# Adding directory
sudo -u $user mkdir -p "$dst_dir" >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Error: directory $dst_dir was not created"
exit 3
fi
# Extiging
exit

44
bin/v-add-fs-file Executable file
View file

@ -0,0 +1,44 @@
#!/bin/bash
# info: add file
# options: USER FILE
#
# The function creates new files on file system
user=$1
dst_file=$2
# Checking arguments
if [ -z "$dst_file" ]; then
echo "Usage: USER FILE"
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
exit 3
fi
# Checking user homedir
homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
if [ -z $homedir ]; then
echo "Error: user home directory doesn't exist"
exit 12
fi
# Checking destination path
rpath=$(readlink -f "$dst_file")
if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
echo "Error: invalid destination path $dst_dir"
exit 2
fi
# Creating file
sudo -u $user touch "$dst_file" >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Error: file $dst_file was not created"
exit 3
fi
# Exiting
exit

399
bin/v-add-letsencrypt-domain Executable file
View file

@ -0,0 +1,399 @@
#!/bin/bash
# info: check letsencrypt domain
# options: USER DOMAIN [ALIASES]
#
# The function check and validates domain with Let's Encript
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
domain=$2
aliases=$3
# LE API
API='https://acme-v02.api.letsencrypt.org'
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_identifier_idn() {
identifier_idn=$identifier
if [[ "$identifier_idn" = *[![:ascii:]]* ]]; then
identifier_idn=$(idn -t --quiet -a $identifier_idn)
fi
}
# encode base64
encode_base64() {
cat |base64 |tr '+/' '-_' |tr -d '\r\n='
}
# Let's Encrypt v2 curl function
query_le_v2() {
protected='{"nonce": "'$3'",'
protected=''$protected' "url": "'$1'",'
protected=''$protected' "alg": "RS256", "kid": "'$KID'"}'
content="Content-Type: application/jose+json"
payload_=$(echo -n "$2" |encode_base64)
protected_=$(echo -n "$protected" |encode_base64)
signature_=$(printf "%s" "$protected_.$payload_" |\
openssl dgst -sha256 -binary -sign $USER_DATA/ssl/user.key |\
encode_base64)
post_data='{"protected":"'"$protected_"'",'
post_data=$post_data'"payload":"'"$payload_"'",'
post_data=$post_data'"signature":"'"$signature_"'"}'
# Save http response to file passed as "$4" arg or print to stdout if not provided
# http response headers are always sent to stdout
local save_to_file=${4:-"/dev/stdout"}
curl --silent --dump-header /dev/stdout --data "$post_data" "$1" --header "$content" --output "$save_to_file"
}
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [ALIASES]'
is_format_valid 'user' 'domain' 'aliases'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
get_domain_values 'web'
echo "-----------------------------------------------------------------------------------" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-add-letsencrypt-domain $domain [$aliases]" >> /usr/local/vesta/log/letsencrypt.log
# check if alias is the letsencrypt wildcard domain, if not, make the normal checks
if [[ "$aliases" != "*.$domain" ]]; then
for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)"
if [ -z "$check_alias" ]; then
echo "[$(date)] : EXIT=domain alias $alias doesn't exist" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_NOTEXIST "domain alias $alias doesn't exist"
fi
done
fi;
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Registering LetsEncrypt user account
echo "[$(date)] : v-add-letsencrypt-user $user" >> /usr/local/vesta/log/letsencrypt.log
$BIN/v-add-letsencrypt-user $user
echo "[$(date)] : result: $?" >> /usr/local/vesta/log/letsencrypt.log
if [ "$?" -ne 0 ]; then
touch $VESTA/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe
send_notice "LETSENCRYPT" "Account registration failed"
echo "[$(date)] : EXIT=LE account registration" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "LE account registration" >/dev/null
fi
# Parsing LetsEncrypt account data
source $USER_DATA/ssl/le.conf
# Checking wildcard alias
if [ "$aliases" = "*.$domain" ]; then
echo "[$(date)] : Checking wildcard alias" >> /usr/local/vesta/log/letsencrypt.log
wildcard='yes'
proto="dns-01"
if [ ! -e "$VESTA/data/users/$user/dns/$domain.conf" ]; then
echo "[$(date)] : EXIT=DNS domain $domain doesn't exist" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_NOTEXIST "DNS domain $domain doesn't exist"
fi
else
proto="http-01"
fi
# Requesting nonce / STEP 1
echo "[$(date)] : --- Requesting nonce / STEP 1 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : curl -s -I \"$API/directory\"" >> /usr/local/vesta/log/letsencrypt.log
answer=$(curl -s -I "$API/directory")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt nonce request status $status" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt nonce request status $status"
fi
# Placing new order / STEP 2
echo "[$(date)] : --- Placing new order / STEP 2 ---" >> /usr/local/vesta/log/letsencrypt.log
url="$API/acme/new-order"
payload='{"identifiers":['
for identifier in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
format_identifier_idn
payload=$payload'{"type":"dns","value":"'$identifier_idn'"},'
done
payload=$(echo "$payload"|sed "s/,$//")
payload=$payload']}'
echo "[$(date)] : payload=$payload" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
answer=$(query_le_v2 "$url" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
authz=$(echo "$answer" |grep "acme/authz" |cut -f2 -d '"')
echo "[$(date)] : authz=$authz" >> /usr/local/vesta/log/letsencrypt.log
finalize=$(echo "$answer" |grep 'finalize":' |cut -f4 -d '"')
echo "[$(date)] : finalize=$finalize" >> /usr/local/vesta/log/letsencrypt.log
status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
if [[ "$status" -ne 201 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt new auth status $status" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt new auth status $status"
fi
# Requesting authorization token / STEP 3
echo "[$(date)] : --- Requesting authorization token / STEP 3 ---" >> /usr/local/vesta/log/letsencrypt.log
for auth in $authz; do
payload=''
echo "[$(date)] : for auth=$auth" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$auth\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
answer=$(query_le_v2 "$auth" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
url=$(echo "$answer" |grep -A3 $proto |grep '"url"' |cut -f 4 -d \")
echo "[$(date)] : url=$url" >> /usr/local/vesta/log/letsencrypt.log
token=$(echo "$answer" |grep -A3 $proto |grep token |cut -f 4 -d \")
echo "[$(date)] : token=$token" >> /usr/local/vesta/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt acme/authz bad status $status" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt acme/authz bad status $status"
fi
# Configuring challenge / STEP 4
echo "[$(date)] : --- Configuring challenge / STEP 4 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : wildcard=$wildcard" >> /usr/local/vesta/log/letsencrypt.log
if [ "$wildcard" = 'yes' ]; then
record=$(printf "%s" "$token.$THUMB" |\
openssl dgst -sha256 -binary |encode_base64)
old_records=$($BIN/v-list-dns-records $user $domain plain|grep 'TXT')
old_records=$(echo "$old_records" |grep _acme-challenge |cut -f 1)
for old_record in $old_records; do
$BIN/v-delete-dns-record "$user" "$domain" "$old_record"
done
$BIN/v-add-dns-record "$user" "$domain" "_acme-challenge" "TXT" "$record"
exitstatus=$?
echo "[$(date)] : v-add-dns-record \"$user\" \"$domain\" \"_acme-challenge\" \"TXT\" \"$record\"" >> /usr/local/vesta/log/letsencrypt.log
if [ "$exitstatus" -ne 0 ]; then
echo "[$(date)] : EXIT=DNS _acme-challenge record wasn't created" >> /usr/local/vesta/log/letsencrypt.log
fi
check_result $exitstatus "DNS _acme-challenge record wasn't created"
else
if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then
if [ -f "/usr/local/vesta/web/inc/nginx_proxy" ]; then
# if vesta is behind main nginx
well_known="$HOMEDIR/$user/web/$domain/public_html/.well-known"
acme_challenge="$well_known/acme-challenge"
mkdir -p $acme_challenge
echo "$token.$THUMB" > $acme_challenge/$token
echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/vesta/log/letsencrypt.log
chown -R $user:$user $well_known
else
# default nginx method
conf="$HOMEDIR/$user/conf/web/nginx.$domain.conf_letsencrypt"
sconf="$HOMEDIR/$user/conf/web/snginx.$domain.conf_letsencrypt"
# if [ ! -e "$conf" ]; then
echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' \
> $conf
echo ' default_type text/plain;' >> $conf
echo ' return 200 "$1.'$THUMB'";' >> $conf
echo '}' >> $conf
# fi
echo "[$(date)] : in $conf we put: $THUMB" >> /usr/local/vesta/log/letsencrypt.log
if [ ! -e "$sconf" ]; then
ln -s "$conf" "$sconf"
fi
echo "[$(date)] : v-restart-proxy" >> /usr/local/vesta/log/letsencrypt.log
$BIN/v-restart-proxy
if [ -z "$PROXY_SYSTEM" ]; then
# apache-less variant
echo "[$(date)] : v-restart-web" >> /usr/local/vesta/log/letsencrypt.log
$BIN/v-restart-web
fi
exitstatus=$?
if [ "$exitstatus" -ne 0 ]; then
echo "[$(date)] : EXIT=Proxy restart failed = $exitstatus" >> /usr/local/vesta/log/letsencrypt.log
fi
check_result $exitstatus "Proxy restart failed" >/dev/null
fi
else
well_known="$HOMEDIR/$user/web/$domain/public_html/.well-known"
acme_challenge="$well_known/acme-challenge"
mkdir -p $acme_challenge
echo "$token.$THUMB" > $acme_challenge/$token
chown -R $user:$user $well_known
echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/vesta/log/letsencrypt.log
# $BIN/v-restart-web
# check_result $? "Web restart failed" >/dev/null
fi
fi
# Requesting ACME validation / STEP 5
echo "[$(date)] : --- Requesting ACME validation / STEP 5 ---" >> /usr/local/vesta/log/letsencrypt.log
validation_check=$(echo "$answer" |grep '"valid"')
echo "[$(date)] : validation_check=$validation_check" >> /usr/local/vesta/log/letsencrypt.log
if [[ ! -z "$validation_check" ]]; then
validation='valid'
else
validation='pending'
fi
# Doing pol check on status
i=1
while [ "$validation" = 'pending' ]; do
echo "[$(date)] : - Doing pol check on status" >> /usr/local/vesta/log/letsencrypt.log
payload='{}'
echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
answer=$(query_le_v2 "$url" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
validation=$(echo "$answer"|grep -A1 $proto |tail -n1|cut -f4 -d \")
echo "[$(date)] : validation=$validation" >> /usr/local/vesta/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt validation status $status" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt validation status $status"
fi
i=$((i + 1))
if [ "$i" -gt 10 ]; then
echo "[$(date)] : EXIT=Let's Encrypt domain validation timeout" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt domain validation timeout"
fi
sleeping=$((i*2))
echo "[$(date)] : sleep $sleeping (i=$i)" >> /usr/local/vesta/log/letsencrypt.log
sleep $sleeping
done
if [ "$validation" = 'invalid' ]; then
echo "[$(date)] : EXIT=Let's Encrypt domain verification failed" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt domain verification failed"
fi
done
# Generating new ssl certificate
ssl_dir=$($BIN/v-generate-ssl-cert "$domain" "info@$domain" "US" "California"\
"San Francisco" "Vesta" "IT" "$aliases" |tail -n1 |awk '{print $2}')
# Sending CSR to finalize order / STEP 6
echo "[$(date)] : --- Sending CSR to finalize order / STEP 6 ---" >> /usr/local/vesta/log/letsencrypt.log
csr=$(openssl req -in $ssl_dir/$domain.csr -outform DER |encode_base64)
payload='{"csr":"'$csr'"}'
echo "[$(date)] : query_le_v2 \"$finalize\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
answer=$(query_le_v2 "$finalize" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
certificate=$(echo "$answer"|grep 'certificate":' |cut -f4 -d '"')
echo "[$(date)] : certificate=$certificate" >> /usr/local/vesta/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt finalize bad status $status" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt finalize bad status $status"
fi
# Downloading signed certificate / STEP 7
echo "[$(date)] : --- Downloading signed certificate / STEP 7 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$certificate\" \"\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
answer=$(query_le_v2 "$certificate" "" "$nonce" "$ssl_dir/$domain.pem")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
[ -d "$ssl_dir" ] && rm -rf "$ssl_dir"
echo "[$(date)] : EXIT=Let's Encrypt downloading signed cert failed status: $status" >> /usr/local/vesta/log/letsencrypt.log
check_result $E_NOTEXIST "Let's Encrypt downloading signed cert failed status: $status"
fi
# Splitting up downloaded pem
# echo "[$(date)] : - Splitting up downloaded pem" >> /usr/local/vesta/log/letsencrypt.log
crt_end=$(grep -n 'END CERTIFICATE' $ssl_dir/$domain.pem |head -n1 |cut -f1 -d:)
# echo "[$(date)] : crt_end=$crt_end" >> /usr/local/vesta/log/letsencrypt.log
head -n $crt_end $ssl_dir/$domain.pem > $ssl_dir/$domain.crt
pem_lines=$(wc -l $ssl_dir/$domain.pem |cut -f 1 -d ' ')
# echo "[$(date)] : pem_lines=$pem_lines" >> /usr/local/vesta/log/letsencrypt.log
ca_end=$(grep -n 'BEGIN CERTIFICATE' $ssl_dir/$domain.pem |tail -n1 |cut -f 1 -d :)
# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/vesta/log/letsencrypt.log
ca_end=$(( pem_lines - crt_end + 1 ))
# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/vesta/log/letsencrypt.log
tail -n $ca_end $ssl_dir/$domain.pem > $ssl_dir/$domain.ca
# Temporary fix for double "END CERTIFICATE"
if [[ $(head -n 1 $ssl_dir/$domain.ca) = "-----END CERTIFICATE-----" ]]; then
sed -i '1,2d' $ssl_dir/$domain.ca
fi
# Adding SSL
ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME')
$BIN/v-delete-web-domain-ssl $user $domain >/dev/null 2>&1
echo "[$(date)] : v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home" >> /usr/local/vesta/log/letsencrypt.log
$BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home
exitstatus=$?
echo "[$(date)] : v-add-web-domain-ssl status: $exitstatus" >> /usr/local/vesta/log/letsencrypt.log
if [ "$exitstatus" -ne '0' ]; then
touch $VESTA/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe
echo "[$(date)] : EXIT=$domain certificate installation failed" >> /usr/local/vesta/log/letsencrypt.log
send_notice 'LETSENCRYPT' "$domain certificate installation failed"
check_result $exitstatus "SSL install" >/dev/null
fi
# Adding LE autorenew cronjob
if [ -z "$(grep v-update-lets $VESTA/data/users/admin/cron.conf)" ]; then
min=$(generate_password '012345' '2')
hour=$(generate_password '1234567' '1')
cmd="sudo $BIN/v-update-letsencrypt-ssl"
$BIN/v-add-cron-job admin "$min" "$hour" '*' '*' '*' "$cmd" > /dev/null
fi
# Updating letsencrypt key
if [ -z "$LETSENCRYPT" ]; then
add_object_key "web" 'DOMAIN' "$domain" 'LETSENCRYPT' 'FTP_USER'
fi
update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes'
reset_web_counter "$user" "$domain" 'LETSENCRYPT_FAIL_COUNT'
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Deleteing task from queue
touch $VESTA/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe
# Notifying user
send_notice 'LETSENCRYPT' "$domain SSL has been installed successfully"
echo "[$(date)] : EXIT=***** $domain SSL has been installed successfully *****" >> /usr/local/vesta/log/letsencrypt.log
# Logging
log_event "$OK" "$ARGUMENTS"
exit

141
bin/v-add-letsencrypt-user Executable file
View file

@ -0,0 +1,141 @@
#!/bin/bash
# info: register letsencrypt user account
# options: USER
#
# The function creates and register LetsEncript account
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
# LE API
API='https://acme-v02.api.letsencrypt.org'
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# encode base64
encode_base64() {
cat |base64 |tr '+/' '-_' |tr -d '\r\n='
}
# Let's Encrypt v2 curl function
query_le_v2() {
protected='{"nonce": "'$3'",'
protected=''$protected' "url": "'$1'",'
protected=''$protected' "alg": "RS256", "jwk": '$jwk'}'
content="Content-Type: application/jose+json"
payload_=$(echo -n "$2" |encode_base64)
protected_=$(echo -n "$protected" |encode_base64)
signature_=$(printf "%s" "$protected_.$payload_" |\
openssl dgst -sha256 -binary -sign $USER_DATA/ssl/user.key |\
encode_base64)
post_data='{"protected":"'"$protected_"'",'
post_data=$post_data'"payload":"'"$payload_"'",'
post_data=$post_data'"signature":"'"$signature_"'"}'
curl -s -i -d "$post_data" "$1" -H "$content"
}
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '1' "$#" 'USER'
is_format_valid 'user'
is_object_valid 'user' 'USER' "$user"
if [ -e "$USER_DATA/ssl/le.conf" ]; then
source "$USER_DATA/ssl/le.conf"
fi
if [ ! -z "$KID" ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining user email
if [[ -z "$EMAIL" ]]; then
EMAIL=$(get_user_value '$CONTACT')
fi
# Defining user agreement
agreement=''
# Generating user key
KEY="$USER_DATA/ssl/user.key"
if [ ! -e "$KEY" ]; then
openssl genrsa -out $KEY 4096 >/dev/null 2>&1
chmod 600 $KEY
fi
# Defining key exponent
if [ -z "$EXPONENT" ]; then
EXPONENT=$(openssl pkey -inform pem -in "$KEY" -noout -text_pub |\
grep Exponent: |cut -f 2 -d '(' |cut -f 1 -d ')' |sed -e 's/x//' |\
xxd -r -p |encode_base64)
fi
# Defining key modulus
if [ -z "$MODULUS" ]; then
MODULUS=$(openssl rsa -in "$KEY" -modulus -noout |\
sed -e 's/^Modulus=//' |xxd -r -p |encode_base64)
fi
# Defining JWK
jwk='{"e":"'$EXPONENT'","kty":"RSA","n":"'"$MODULUS"'"}'
# Defining key thumbnail
if [ -z "$THUMB" ]; then
THUMB="$(echo -n "$jwk" |openssl dgst -sha256 -binary |encode_base64)"
fi
# Requesting ACME nonce
nonce=$(curl -s -I "$API/directory" |grep -i nonce |cut -f2 -d\ |tr -d '\r\n')
# Creating ACME account
url="$API/acme/new-acct"
payload='{"termsOfServiceAgreed": true}'
answer=$(query_le_v2 "$url" "$payload" "$nonce")
kid=$(echo "$answer" |grep -i location: |cut -f2 -d ' '|tr -d '\r')
# Checking answer status
status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ')
if [[ "${status:0:2}" -ne "20" ]]; then
check_result $E_CONNECT "Let's Encrypt acc registration failed $status"
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Adding le.conf
if [ ! -e "$USER_DATA/ssl/le.conf" ]; then
echo "EXPONENT='$EXPONENT'" > $USER_DATA/ssl/le.conf
echo "MODULUS='$MODULUS'" >> $USER_DATA/ssl/le.conf
echo "THUMB='$THUMB'" >> $USER_DATA/ssl/le.conf
echo "EMAIL='$EMAIL'" >> $USER_DATA/ssl/le.conf
echo "KID='$kid'" >> $USER_DATA/ssl/le.conf
chmod 660 $USER_DATA/ssl/le.conf
else
sed -i '/^KID=/d' $USER_DATA/ssl/le.conf
echo "KID='$kid'" >> $USER_DATA/ssl/le.conf
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,23 +9,22 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
account=$(echo $3 | tr '[:upper:]' '[:lower:]')
password=$4
quota=${5-0}
domain=$2
account=$3
password=$4; HIDE=4
quota=${5-unlimited}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
# Additional argument formatting
if [[ "$account" =~ [[:upper:]] ]]; then
account=$(echo "$account" |tr '[:upper:]' '[:lower:]')
fi
#----------------------------------------------------------#
@ -33,7 +32,10 @@ EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD [QUOTA]'
validate_format 'user' 'domain' 'account' 'password' 'quota'
is_format_valid 'user' 'domain' 'account'
if [ "$quota" != 'unlimited' ]; then
is_format_valid 'quota'
fi
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -41,19 +43,22 @@ is_object_valid 'mail' 'DOMAIN' "$domain"
is_object_unsuspended 'mail' 'DOMAIN' "$domain"
is_package_full 'MAIL_ACCOUNTS'
is_mail_new "$account"
is_password_valid
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
if [ -x '/usr/bin/doveadm' ]; then
md5=$(/usr/bin/doveadm pw -s md5 -p "$password")
else
md5=$(/usr/sbin/dovecotpw -s md5 -p "$password")
fi
# Generating hashed password
salt=$(generate_password "$PW_MATRIX" "8")
md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
# Adding account info into password file
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
if [ "$quota" = 'unlimited' ]; then
quota='0'
fi
str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
fi
@ -63,9 +68,18 @@ fi
# Vesta #
#----------------------------------------------------------#
str="ACCOUNT='$account' ALIAS='' QUOTA='$quota' AUTOREPLY='no' FWD=''"
str="$str FWD_ONLY='' MD5='$md5' U_DISK='0' SUSPENDED='no' TIME='$TIME'"
str="$str DATE='$DATE'"
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
if [[ "$quota" -eq '0' ]]; then
quota='unlimited'
fi
str="ACCOUNT='$account' ALIAS='' AUTOREPLY='no' FWD='' FWD_ONLY=''"
str="$str MD5='$md5' QUOTA='$quota' U_DISK='0' SUSPENDED='no'"
str="$str TIME='$time' DATE='$date'"
echo "$str" >> $USER_DATA/mail/$domain.conf
chmod 660 $USER_DATA/mail/$domain.conf
@ -76,6 +90,6 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$ACCOUNTS' "$accounts"
# Logging
log_history "added mail account $account@$domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
account=$3
malias=$4
@ -22,13 +21,18 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ACCOUNT ALIAS'
validate_format 'user' 'domain' 'account' 'malias'
is_format_valid 'user' 'domain' 'account' 'malias'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -45,7 +49,7 @@ is_mail_new "$malias"
# Adding exim alias
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
str="$malias@$domain:$account@$domain"
str="$malias@$domain_idn:$account@$domain_idn"
echo "$str" >> $HOMEDIR/$user/conf/mail/$domain/aliases
fi
@ -65,6 +69,6 @@ update_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS' "$aliases"
# Logging
log_history "added alias $malias to $account@$domain "
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
account=$3
autoreply=$4
@ -29,13 +28,18 @@ else
MAIL_USER=exim
fi
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ACCOUNT MESSAGE'
validate_format 'user' 'domain' 'account' 'autoreply'
is_format_valid 'user' 'domain' 'account' 'autoreply'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -70,6 +74,6 @@ update_object_value "mail/$domain" 'ACCOUNT' "$account" '$AUTOREPLY' 'yes'
# Logging
log_history "added autoreply message on $account@$domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
account=$3
forward=$4
@ -22,13 +21,17 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ACCOUNT FORWARD'
validate_format 'user' 'domain' 'account' 'forward'
is_format_valid 'user' 'domain' 'account' 'forward'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -39,7 +42,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
fwd=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD')
if [ ! -z "$(echo $fwd | grep -w $forward)" ]; then
echo "Error: forward $forward exists"
log_event "$E_EXISTS $EVENT"
log_event "$E_EXISTS $ARGUMENTS"
exit $E_EXISTS
fi
@ -57,8 +60,8 @@ fi
# Adding forward to exim
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "$account@$domain_idn:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
fi
@ -71,6 +74,6 @@ update_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD' "$fwd"
# Logging
log_history "added forwarding from $account@$domain to $forward"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
account=$3
# Includes
@ -28,13 +27,18 @@ else
MAIL_USER=exim
fi
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN ACCOUNT'
validate_format 'user' 'domain' 'account'
is_format_valid 'user' 'domain' 'account'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -45,7 +49,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
fwd=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD')
if [ -z "$fwd" ]; then
echo "Error: forward doesn't exist"
log_event "$E_NOTEXIST $EVENT"
log_event "$E_NOTEXIST $ARGUMENTS"
exit $E_NOTEXIST
fi
@ -56,7 +60,7 @@ fi
# Adding account to fwd_only
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
echo "$account" > $HOMEDIR/$user/conf/mail/$domain/fwd_only
echo "$account" >> $HOMEDIR/$user/conf/mail/$domain/fwd_only
chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain/fwd_only
fi
@ -71,6 +75,6 @@ update_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD_ONLY' "yes"
# Logging
log_history "added fwd_only flag for $account@$domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,12 +9,9 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
antispam=${3-yes}
antivirus=${4-yes}
dkim=${5-yes}
@ -32,28 +29,38 @@ else
MAIL_USER=exim
fi
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [ANTISPAM] [ANTIVIRUS] [DKIM] [DKIM_SIZE]'
validate_format 'user' 'domain' 'antispam' 'antivirus' 'dkim' 'dkim_size'
is_format_valid 'user' 'domain' 'antispam' 'antivirus' 'dkim' 'dkim_size'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_domain_new 'mail'
is_domain_new 'mail' "$domain"
is_package_full 'MAIL_DOMAINS'
is_dir_symlink $HOMEDIR/$user/mail
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding domain to mail.conf
s="DOMAIN='$domain' ANTIVIRUS='$antivirus' ANTISPAM='$antispam' DKIM='$dkim'"
s="$s ACCOUNTS='0' U_DISK='0' CATCHALL='' SUSPENDED='no' TIME='$TIME'"
s="$s DATE='$DATE'"
s="$s CATCHALL='' ACCOUNTS='0' U_DISK='0' SUSPENDED='no' TIME='$time'"
s="$s DATE='$date'"
echo $s >> $USER_DATA/mail.conf
touch $USER_DATA/mail/$domain.conf
@ -113,10 +120,10 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$dkim" = 'yes' ]; then
p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
record='_domainkey'
policy="\"t=y; o=~;\""
$BIN/v-add-dns-record $user $domain $record TXT "$policy"
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
record='mail._domainkey'
selector="\"k=rsa\; p=$p\""
selector="\"v=DKIM1\; k=rsa\; p=$p\""
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
fi
fi
@ -134,6 +141,6 @@ fi
# Logging
log_history "added mail domain $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -2,31 +2,35 @@
# info: add mail domain antispam support
# options: USER DOMAIN
#
# The function enables spamassasin for incomming emails.
# The function enables spamassasin for incoming emails.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -54,6 +58,6 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'yes'
# Logging
log_history "enabled antispam on $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -2,31 +2,35 @@
# info: add mail domain antivirus support
# options: USER DOMAIN
#
# The function enables clamav scan for incomming emails.
# The function enables clamav scan for incoming emails.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -54,6 +58,6 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'yes'
# Logging
log_history "enabled antivirus on $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -2,18 +2,17 @@
# info: add mail domain catchall account
# options: USER DOMAIN EMAIL
#
# The function enables catchall account for incomming emails.
# The function enables catchall account for incoming emails.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
email="$3"
# Includes
@ -21,13 +20,17 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN EMAIL'
validate_format 'user' 'domain' 'email'
is_format_valid 'user' 'domain' 'email'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -42,8 +45,8 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$CATCHALL'
# Adding catchall alias
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "*@$domain_idn:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
fi
@ -56,6 +59,6 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
# Logging
log_history "added $email as catchall email for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
dkim_size=${3-1024}
# Includes
@ -28,13 +27,18 @@ else
MAIL_USER=exim
fi
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [DKIM_SIZE]'
validate_format 'user' 'domain' 'dkim_size'
is_format_valid 'user' 'domain' 'dkim_size'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -63,12 +67,12 @@ fi
# Adding dns records
if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
record='_domainkey'
record="_domainkey"
policy="\"t=y; o=~;\""
$BIN/v-add-dns-record $user $domain $record TXT "$policy"
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
record='mail._domainkey'
selector="\"k=rsa\; p=$p\""
record="mail._domainkey"
selector="\"v=DKIM1\; k=rsa\; p=$p\""
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
fi
@ -79,10 +83,10 @@ fi
# Adding dkim in config
update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'yes'
increase_user_value "$user" '$U_MAIL_DKMI'
increase_user_value "$user" '$U_MAIL_DKIM'
# Logging
log_history "enabled DKIM support for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,12 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$2
flush=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
@ -25,103 +26,61 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [FLUSH]'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
echo "Error: dns-cluster.conf doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l)
if [ "$number_of_proc" -gt 2 ]; then
echo "Error: another sync process already exists"
log_event "$E_EXISTS $EVENT"
exit $E_EXISTS
fi
is_procces_running
remote_dns_health_check
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Check domain existance
check_local_domain=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null)
if [ -z "$check_local_domain" ]; then
# Parsing domain record
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null)
if [ -z "$str" ]; then
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
queue_str=$(grep -n "$SCRIPT $1 $2 " $pipe |cut -f1 -d: |head -n1)
if [ ! -z "$queue_str" ]; then
sed -i "$queue_str d" $pipe
fi
exit
fi
old_ifs="$IFS"
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Check remote dns nodes
remote_dns_health_check
# Parsing remote dns host parameters
eval $cluster
search_str=$(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf)
for cluster_str in $search_str; do
# Get host values
eval $cluster_str
# Check connection type
if [ -z "TYPE" ]; then
TYPE='api'
fi
# Check recipient dns user
if [ -z "$DNS_USER" ]; then
DNS_USER='dns-cluster'
fi
# Switch on connection type
case $TYPE in
ssh) send_cmd="send_ssh_cmd" ;;
*) send_cmd="send_api_cmd" ;;
esac
# Check dns exceptions
if [ -z "$DNS_CLUSTER_IGNORE" ]; then
DNS_CLUSTER_IGNORE='dns-cluster'
fi
# Check flush parameters
# Sync domain
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
# Parsing domain parameters
eval $str
$send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME "$flush" 'no'
if [ $? -eq 0 ]; then
# Sync records
if [ "$TYPE" = 'ssh' ]; then
tmp=$(mktemp -u)
scp_cmd $USER_DATA/dns/$DOMAIN.conf $tmp
$send_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp 'no'
else
for str in $(cat $USER_DATA/dns/$DOMAIN.conf); do
str=$(echo "$str" | sed 's/"/\\"/g')
$send_cmd v-insert-dns-record $DNS_USER $DOMAIN "$str"
done
fi
# Syncing domain data
cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME $flush 'no'
check_result $? "$HOST connection failed" $E_CONNECT
# Rebuild dns zone
$send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed"
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
fi
# Syncing domain records
tmp_file="/tmp/vst-sync.$DOMAIN"
cluster_file $USER_DATA/dns/$DOMAIN.conf $tmp_file
check_result $? "$HOST connection failed" $E_CONNECT
# Inserting synced records
cluster_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp_file 'no'
check_result $? "$HOST connection failed" $E_CONNECT
# Rebuilding dns zone
cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no'
check_result $? "$HOST connection failed" $E_CONNECT
done
# Update pipe
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating pipe
rm -f $tmpfile
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 " $pipe | cut -f1 -d: | head -n1)
@ -129,8 +88,4 @@ if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
exit

View file

@ -9,12 +9,17 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
host=$1
HOST=$host
port=$2
PORT=$port
user=$3
password=$4
USER=$user
password=$4; HIDE=4
PASSWORD=$password
type=${5-api}
TYPE="$type"
dns_user=${6-dns-cluster}
DNS_USER=$dns_user
@ -23,9 +28,6 @@ source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
# Hiding passwords
A4='******'
#----------------------------------------------------------#
# Verifications #
@ -33,8 +35,9 @@ A4='******'
args_usage='HOST PORT USER PASSWORD [TYPE] [DNS_USER]'
check_args '4' "$#" "$args_usage"
validate_format 'host' 'port' 'user' 'password' 'type' 'dns_user'
is_format_valid 'host' 'port' 'user' 'type' 'dns_user'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_password_valid
is_dnshost_new
is_dnshost_alive
@ -43,10 +46,15 @@ is_dnshost_alive
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatentating dns host string
str="HOST='$host' PORT='$port' USER='$user' PASSWORD='$password'"
str="$str DNS_USER='$dns_user' TYPE='$type' SUSPENDED='no'"
str="$str TIME='$TIME' DATE='$DATE'"
str="$str TIME='$time' DATE='$date'"
# Adding host to dns-cluster.conf
echo "$str" >> $VESTA/conf/dns-cluster.conf
@ -59,37 +67,27 @@ else
sed -i "s/DNS_CLUSTER=.*/DNS_CLUSTER='yes'/g" $VESTA/conf/vesta.conf
fi
# Enabling restart queue
HOST=$host
PORT=$port
USER=$user
PASSWORD=$password
case $type in
ssh) send_cmd="send_ssh_cmd" ;;
*) send_cmd="send_api_cmd" ;;
esac
$send_cmd v-add-cron-restart-job
# Enabling remote dns-cluster queue
cluster_cmd v-add-cron-restart-job
check_result $? "$HOST connection failed" $E_CONNECT
# Sync current zones
# Syncing all domains
$BIN/v-sync-dns-cluster $host
return_code=$?
if [ "$return_code" -ne 0 ]; then
exit $return_code
fi
# Add dns-cluster cron job
cmd="sudo /usr/local/vesta/bin/v-update-sys-queue dns-cluster"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"
fi
check_result $? "$HOST sync failed" $E_CONNECT
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Adding local dns-cluster cron job
cmd="sudo /usr/local/vesta/bin/v-update-sys-queue dns-cluster"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"
fi
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$2
id=$3
@ -25,87 +25,61 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN ID'
validate_format 'user' 'domain' 'id'
is_format_valid 'user' 'domain' 'id'
is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
is_object_valid 'user' 'USER' "$user"
is_object_valid 'dns' 'DOMAIN' "$domain"
is_object_valid "dns/$domain" 'ID' "$id"
if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
echo "Error: dns-cluster.conf doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l)
if [ "$number_of_proc" -gt 2 ]; then
echo "Error: another sync process already exists"
log_event "$E_EXISTS $EVENT"
exit $E_EXISTS
fi
is_procces_running
remote_dns_health_check
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
old_ifs="$IFS"
# Parsing record
str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
if [ -z "$str" ]; then
pipe="$VESTA/data/queue/dns-cluster.pipe"
queue_str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$queue_str" ]; then
sed -i "$queue_str d" $pipe
fi
exit
fi
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Check remote dns nodes
remote_dns_health_check
# Parsing remote host parameters
eval $cluster
for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Get host values
eval $cluster_str
# Syncing serial
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no'
check_result $? "$HOST connection failed (soa sync)" $E_CONNECT
# Check connection type
if [ -z "TYPE" ]; then
TYPE='api'
fi
# Syncing record
str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf | sed 's/"/\\"/g')
cluster_cmd v-insert-dns-record $DNS_USER $domain "$str" 'no'
check_result $? "$HOST connection failed (record sync)" $E_CONNECT
# Switch on connection type
case $TYPE in
ssh) send_cmd="send_ssh_cmd" ;;
*) send_cmd="send_api_cmd" ;;
esac
# Check recipient dns user
if [ -z "$DNS_USER" ]; then
DNS_USER='dns-cluster'
fi
# Check dns exceptions
if [ -z "$DNS_CLUSTER_IGNORE" ]; then
DNS_CLUSTER_IGNORE='dns-cluster'
fi
# Sync record
str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
str=$(echo "$str" | sed 's/"/\\"/g')
$send_cmd v-insert-dns-record $DNS_USER $domain "$str" 'no'
if [ $? -eq 0 ]; then
# Rebuild dns zone
$send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed (rebuild)"
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
fi
# Rebuilding dns zone
cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no'
check_result $? "$HOST connection failed (rebuild)" $E_CONNECT
done
# Update pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
exit

View file

@ -1,54 +1,57 @@
#!/bin/bash
# info: list web domains and proxy key
# options: USER [FORMAT]
# info: add system firewall
# options: NONE
#
# The function for obtaining the list of domains with proxy parameter
# displayed. This call was arranged for filling in the lack of information by
# applying v-list-web-domains call in the shell format.
# The script enables firewall
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
user=$1
format=${2-shell}
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '1' "$#" 'USER [FORMAT]'
validate_format 'user'
is_object_valid 'user' 'USER' "$user"
if [ "$FIREWALL_SYSTEM" = 'iptables' ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining config
conf=$USER_DATA/web.conf
# Adding firewall directory
mkdir -p $VESTA/data/firewall/
# Defining fileds to select
fields="\$DOMAIN \$PROXY \$PROXY_EXT"
# Adding default ruleset
if [ ! -e "$VESTA/data/firewall/rules.conf" ]; then
cp $VESTA/install/rhel/7/* $VESTA/data/firewall/
fi
# Listing domains
case $format in
json) json_list ;;
plain) nohead=1; shell_list ;;
shell) shell_list | column -t ;;
*) check_args '1' '0' 'USER [FORMAT]'
esac
# Updating FIREWAL_SYSTEM value
if [ -z "$(grep FIREWALL_SYSTEM $VESTA/conf/vesta.conf)" ]; then
echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf
else
sed -i "s/FIREWALL_SYSTEM.*/FIREWALL_SYSTEM='iptables'/g" \
$VESTA/conf/vesta.conf
fi
# Updating firewall rules
$BIN/v-update-firewall
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,11 +1,11 @@
#!/bin/bash
# info: add system ip address
# options: IP MASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP]
# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP]
#
# The function adds ip address into a system. It also creates rc scripts. You
# can specify ip name which will be used as root domain for temporary aliases.
# For example, if you set a1.myhosting.com as name, each new domain created on
# this ip will automaticaly receive alias $domain.a1.myhosting.com. Of course
# this ip will automatically receive alias $domain.a1.myhosting.com. Of course
# you must have wildcard record *.a1.myhosting.com pointed to ip. This feature
# is very handy when customer wants to test domain before dns migration.
@ -14,9 +14,9 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
ip=${1// /}
mask=$2
netmask=$2
interface="${3-eth0}"
user="${4-admin}"
ip_status="${5-shared}"
@ -34,36 +34,40 @@ source $VESTA/conf/vesta.conf
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'IP MASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP]'
validate_format 'ip' 'mask' 'interface' 'user' 'ip_status'
check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [NAME] [NATED_IP]'
is_format_valid 'ip' 'netmask' 'interface' 'user' 'ip_status'
is_ip_free
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
if [ ! -z "$ip_name" ] ; then
validate_format 'ip_name'
is_format_valid 'ip_name'
fi
if [ ! -z "$nat_ip" ] ; then
validate_format 'nat_ip'
is_format_valid 'nat_ip'
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
get_ip_iface
sys_ip_check=$(/sbin/ifconfig | grep "addr:$ip ")
iface=$(get_ip_iface)
cidr=$(convert_netmask $netmask)
broadcast=$(get_broadcast $ip $netmask)
sys_ip_check=$(/sbin/ip addr | grep "$ip")
if [ -z "$sys_ip_check" ]; then
# Adding sys ip
/sbin/ifconfig "$iface" "$ip" netmask "$mask"
/sbin/ip addr add $ip/$cidr dev $interface \
broadcast $broadcast label $iface
# Adding RHEL/CentOS/Fedora startup script
if [ -e "/etc/redhat-release" ]; then
# Adding RHEL/CentOS/Fedora/Amazon startup script
if [ -d "/etc/sysconfig" ]; then
sys_ip="# Added by vesta"
sys_ip="$sys_ip\nDEVICE=$iface"
sys_ip="$sys_ip\nBOOTPROTO=static"
sys_ip="$sys_ip\nONBOOT=yes"
sys_ip="$sys_ip\nIPADDR=$ip"
sys_ip="$sys_ip\nNETMASK=$mask"
sys_ip="$sys_ip\nNETMASK=$netmask"
echo -e $sys_ip > /etc/sysconfig/network-scripts/ifcfg-$iface
fi
@ -73,11 +77,16 @@ if [ -z "$sys_ip_check" ]; then
sys_ip="$sys_ip\nauto $iface"
sys_ip="$sys_ip\niface $iface inet static"
sys_ip="$sys_ip\naddress $ip"
sys_ip="$sys_ip\nnetmask $mask"
sys_ip="$sys_ip\nnetmask $netmask"
echo -e $sys_ip >> /etc/network/interfaces
fi
fi
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding vesta ip
echo "OWNER='$user'
STATUS='$ip_status'
@ -85,23 +94,28 @@ NAME='$ip_name'
U_SYS_USERS=''
U_WEB_DOMAINS='0'
INTERFACE='$interface'
NETMASK='$mask'
NETMASK='$netmask'
NAT='$nat_ip'
TIME='$TIME'
DATE='$DATE'" > $VESTA/data/ips/$ip
TIME='$time'
DATE='$date'" > $VESTA/data/ips/$ip
chmod 660 $VESTA/data/ips/$ip
# WEB support
if [ ! -z "$WEB_SYSTEM" ]; then
web_conf="/etc/$WEB_SYSTEM/conf.d/$ip.conf"
rm -f $web_conf
if [ "$WEB_SYSTEM" = 'httpd' ] || [ "$WEB_SYSTEM" = 'apache2' ]; then
echo "NameVirtualHost $ip:$WEB_PORT" > $web_conf
if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
echo "NameVirtualHost $ip:$WEB_PORT" > $web_conf
fi
echo "Listen $ip:$WEB_PORT" >> $web_conf
fi
if [ "$WEB_SSL" = 'mod_ssl' ]; then
echo "NameVirtualHost $ip:$WEB_SSL_PORT" >> $web_conf
if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
echo "NameVirtualHost $ip:$WEB_SSL_PORT" >> $web_conf
fi
echo "Listen $ip:$WEB_SSL_PORT" >> $web_conf
fi
fi
@ -128,6 +142,14 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
rpaf_str="$rpaf_str $ip"
sed -i "s/.*RPAFproxy_ips.*/$rpaf_str/" $rpaf_conf
fi
#mod_remoteip
remoteip_conf="/etc/$WEB_SYSTEM/mods-enabled/remoteip.conf"
if [ -e "$remoteip_conf" ]; then
if [ $( grep -ic "$ip" $remoteip_conf ) -eq 0 ]; then
sed -i "s/<\/IfModule>/RemoteIPInternalProxy $ip\n<\/IfModule>/g" $remoteip_conf
fi
fi
fi
@ -150,18 +172,23 @@ else
increase_user_value 'admin' '$IP_AVAIL'
fi
# Restart web server
# Restarting web server
$BIN/v-restart-web
if [ $? -ne 0 ]; then
exit $E_RESTART
check_result $? "Web restart failed" >/dev/null
# Restarting proxy server
if [ ! -z "$PROXY_SYSTEM" ]; then
$BIN/v-restart-proxy
check_result $? "Proxy restart failed" >/dev/null
fi
$BIN/v-restart-proxy
if [ $? -ne 0 ]; then
exit $E_RESTART
# Restarting firewall
if [ ! -z "$FIREWALL_SYSTEM" ]; then
$BIN/v-update-firewall
fi
# Logging
log_history "added system ip address $ip" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

106
bin/v-add-sys-mail-ssl Executable file
View file

@ -0,0 +1,106 @@
#!/bin/bash
# info: copy mail ssl certificate
# options: USER DOMAIN [RESTART]
#
# The function copies user domain SSL to mail SSL directory
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
domain=$2
restart=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [RESTART]'
is_format_valid 'user' 'domain'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining certificate location
dom_crt="/home/$user/conf/web/ssl.$domain.pem"
dom_key="/home/$user/conf/web/ssl.$domain.key"
vst_crt="$VESTA/ssl/mail.crt"
vst_key="$VESTA/ssl/mail.key"
# Checking certificate
if [ ! -e "$dom_crt" ] || [ ! -e "$dom_key" ]; then
check_result $E_NOTEXIST "$domain certificate doesn't exist"
fi
# Checking difference
diff $dom_crt $vst_crt >/dev/null 2>&1
if [ $? -ne 0 ]; then
rm -f $vst_crt.old $vst_key.old
mv $vst_crt $vst_crt.old >/dev/null 2>&1
mv $vst_key $vst_key.old >/dev/null 2>&1
cp $dom_crt $vst_crt 2>/dev/null
cp $dom_key $vst_key 2>/dev/null
chown root:mail $vst_crt $vst_key
else
restart=no
fi
# Updating mail certificate
case $MAIL_SYSTEM in
exim) conf='/etc/exim/exim.conf';;
exim4) conf='/etc/exim4/exim4.conf.template';;
esac
if [ -e "$conf" ]; then
sed -e "s|^tls_certificate.*|tls_certificate = $vst_crt|" \
-e "s|^tls_privatekey.*|tls_privatekey = $vst_key|" -i $conf
fi
# Updating imap certificate
conf="/etc/dovecot/conf.d/10-ssl.conf"
if [ ! -z "$IMAP_SYSTEM" ] && [ -e "$conf" ]; then
sed -e "s|ssl_cert.*|ssl_cert = <$vst_crt|" \
-e "s|ssl_key.*|ssl_key = <$vst_key|" -i $conf
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Restarting services
if [ "$restart" != 'no' ]; then
if [ ! -z "$MAIL_SYSTEM" ]; then
$BIN/v-restart-service $MAIL_SYSTEM
fi
if [ ! -z "$IMAP_SYSTEM" ]; then
$BIN/v-restart-service $IMAP_SYSTEM
fi
fi
# Updating vesta.conf
if [ -z "$(grep MAIL_CERTIFICATE $VESTA/conf/vesta.conf)" ]; then
echo "MAIL_CERTIFICATE='$user:$domain'" >> $VESTA/conf/vesta.conf
else
sed -i "s/MAIL_CERTIFICATE.*/MAIL_CERTIFICATE='$user:$domain'/g" \
$VESTA/conf/vesta.conf
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,12 +1,12 @@
#!/bin/bash
# info: add system quota
# opions: NONE
# options: NONE
#
# The script enables filesystem quota on /home patition
# The script enables filesystem quota on /home partition
#----------------------------------------------------------#
# Variable&Function #
# Variable & Function #
#----------------------------------------------------------#
# Includes
@ -19,21 +19,15 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Checking quota package
if [ ! -e "/usr/sbin/setquota" ]; then
if [ -e "/etc/redhat-release" ]; then
quota=$(which --skip-alias --skip-functions quota 2>/dev/null)
if [ $? -ne 0 ]; then
if [ -d "/etc/sysconfig" ]; then
yum -y install quota >/dev/null 2>&1
result=$?
check_result $? "quota package installation failed" $E_UPDATE
else
export DEBIAN_FRONTEND=noninteractive
apt-get -y install quota >/dev/null 2>&1
result=$?
fi
# Checking installation status
if [ "$result" -ne 0 ]; then
echo "Error: quota package wasn't successfully installed"
log_event "$E_UPDATE" "$EVENT"
exit $E_UPDATE
check_result $? "quota package installation failed" $E_UPDATE
fi
fi
@ -42,38 +36,38 @@ fi
# Action #
#----------------------------------------------------------#
# Adding usrquota option on /home partition
mnt=$(df -P /home |awk '{print $6}' |tail -n1)
lnr=$(cat -n /etc/fstab |awk '{print $1,$3}' |grep "$mnt$" |cut -f 1 -d ' ')
options=$(sed -n ${lnr}p /etc/fstab |awk '{print $4}')
if [ -z "$(echo $options |grep usrquota)" ]; then
sed -i "$lnr s/$options/$options,usrquota/" /etc/fstab
# Adding group and user quota on /home partition
mnt=$(df -P /home | awk '{print $6}' | tail -n1)
lnr=$(cat -n /etc/fstab | grep -v "#" | awk '{print $1,$3}' | grep "$mnt$" | cut -f 1 -d ' ')
opt=$(sed -n ${lnr}p /etc/fstab | awk '{print $4}')
fnd='usrquota\|grpquota\|usrjquota=aquota.user\|grpjquota=aquota.group\|jqfmt=vfsv0'
if [ $(echo $opt | tr ',' '\n' | grep -x $fnd | wc -l) -ne 5 ]; then
old=$(echo $(echo $opt | tr ',' '\n' | grep -v 'usrquota\|grpquota\|usrjquota=\|grpjquota=\|jqfmt=') | tr ' ' ',')
new='usrquota,grpquota,usrjquota=aquota.user,grpjquota=aquota.group,jqfmt=vfsv0'
sed -i "$lnr s/$opt/$old,$new/" /etc/fstab
mount -o remount $mnt
fi
# Adding aquota.user file
if [ ! -e "$mnt/aquota.user" ]; then
quotacheck -cu $mnt >/dev/null 2>&1
# Adding v2 group and user quota index
if [ ! -e "$mnt/aquota.user" ] || [ ! -e "$mnt/aquota.group" ]; then
quotacheck -avcugm >/dev/null 2>&1
fi
# Building fs quota index
quotacheck -um $mnt
# Adding quotacheck on reboot
touch /forcequotacheck
# Adding weekly cron job
echo "quotacheck -um $mnt" > /etc/cron.daily/quotacheck
# Adding cron job
echo '#!/bin/bash' > /etc/cron.daily/quotacheck
echo 'touch /forcequotacheck' >> /etc/cron.daily/quotacheck
chmod a+x /etc/cron.daily/quotacheck
# Enabling fs quota
if [ ! -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then
quotaon $mnt
if [ $? -ne 0 ]; then
echo "Error: quota can't be enabled on $mnt partition"
log_event "$E_DISK" "$EVENT"
exit $E_DISK
fi
# Enabling group and user quota
if [ ! -z "$(quotaon -pa | grep " $mnt " | grep 'user\|group' | grep 'is off')" ]; then
quotaon -v $mnt
check_result $? "quota can't be enabled in $mnt" $E_DISK
fi
# Updating DISK_QUOTA value
# Updating vesta.conf value
if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then
echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf
else
@ -91,6 +85,6 @@ done
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

106
bin/v-add-sys-sftp-jail Executable file
View file

@ -0,0 +1,106 @@
#!/bin/bash
# info: add system sftp jail
# options: NONE
#
# The script enables sftp jailed environment
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Importing system environment as we run this script
# mostly by cron which do not read it by itself
source /etc/profile
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
if [ -z "$SFTPJAIL_KEY" ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Checking sshd directives
config='/etc/ssh/sshd_config'
sftp_n=$(grep -n "Subsystem.*sftp" $config |grep -v internal |grep -v ":#")
sftp_i=$(grep -n "Subsystem.*sftp" $config |grep internal |grep -v ":#")
# Disabling normal sftp
if [ ! -z "$sftp_n" ]; then
fline=$(echo $sftp_n |cut -f 1 -d :)
sed -i "${fline}s/Subsystem.*sftp/#Subsystem sftp/" $config
restart='yes'
fi
# Enabling jailed sftp
if [ -z "$sftp_i" ]; then
echo " " >> $config
echo "Subsystem sftp internal-sftp" >> $config
echo "Match Group sftp-only" >> $config
echo "ChrootDirectory /chroot/%u" >> $config
echo " AllowTCPForwarding no" >> $config
echo " X11Forwarding no" >> $config
echo " ForceCommand internal-sftp" >> $config
restart='yes'
fi
# Validating opensshd config
if [ "$restart" = 'yes' ]; then
subj="OpenSSH restart failed"
email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \')
/usr/sbin/sshd -t >/dev/null 2>&1
if [ "$?" -ne 0 ]; then
mail_text="OpenSSH can not be restarted. Please check config:
\n\n$(/usr/sbin/sshd -t)"
echo -e "$mail_text" |$SENDMAIL -s "$subj" $email
else
service ssh restart >/dev/null 2>&1
service sshd restart >/dev/null 2>&1
fi
fi
# Adding sftp group
groupadd sftp-only 2>/dev/null
# Checking users
shells="rssh|nologin"
for user in $(grep "$HOMEDIR" /etc/passwd |egrep "$shells" |cut -f 1 -d:); do
$BIN/v-add-user-sftp-jail $user
done
# Adding v-add-sys-sftp-jail to startup
if [ -e "/etc/rc.local" ]; then
check_sftp=$(grep $0 /etc/rc.local)
check_exit=$(grep ^exit /etc/rc.local)
if [ -z "$check_sftp" ]; then
if [ -z "$check_exit" ]; then
echo "$BIN/v-add-sys-sftp-jail" >> /etc/rc.local
else
sed -i "s|^exit|$BIN/v-add-sys-sftp-jail\nexit|" /etc/rc.local
fi
fi
chmod +x /etc/rc.local
else
echo "$BIN/v-add-sys-sftp-jail" > /etc/rc.local
chmod +x /etc/rc.local
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

97
bin/v-add-sys-vesta-ssl Executable file
View file

@ -0,0 +1,97 @@
#!/bin/bash
# info: add vesta ssl certificate
# options: USER DOMAIN [RESTART]
#
# The function copies user domain SSL to vesta SSL directory
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
domain=$2
restart=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [RESTART]'
is_format_valid 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining certificate location
dom_crt="/home/$user/conf/web/ssl.$domain.pem"
dom_key="/home/$user/conf/web/ssl.$domain.key"
vst_crt="$VESTA/ssl/certificate.crt"
vst_key="$VESTA/ssl/certificate.key"
# Checking certificate
if [ ! -e "$dom_crt" ] || [ ! -e "$dom_key" ]; then
check_result $E_NOTEXIST "$domain certificate doesn't exist"
fi
# Checking difference
diff $dom_crt $vst_crt >/dev/null 2>&1
if [ $? -ne 0 ]; then
rm -f $vst_crt.old $vst_key.old
mv $vst_crt $vst_crt.old
mv $vst_key $vst_key.old
cp $dom_crt $vst_crt 2>/dev/null
cp $dom_key $vst_key 2>/dev/null
chown root:mail $vst_crt $vst_key
else
restart=no
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Restarting services
if [ "$restart" != 'no' ]; then
if [ ! -z "$MAIL_SYSTEM" ] && [ -z "$MAIL_CERTIFICATE" ]; then
$BIN/v-restart-service $MAIL_SYSTEM
fi
if [ ! -z "$IMAP_SYSTEM" ] && [ -z "$MAIL_CERTIFICATE" ]; then
$BIN/v-restart-service $IMAP_SYSTEM
fi
if [ ! -z "$FTP_SYSTEM" ]; then
$BIN/v-restart-service "$FTP_SYSTEM"
fi
if [ -e "/var/run/vesta-nginx.pid" ]; then
kill -HUP $(cat /var/run/vesta-nginx.pid)
else
service vesta restart
fi
fi
# Updating vesta.conf
if [ -z "$(grep VESTA_CERTIFICATE $VESTA/conf/vesta.conf)" ]; then
echo "VESTA_CERTIFICATE='$user:$domain'" >> $VESTA/conf/vesta.conf
else
sed -i "s/VESTA_CERTIFICATE.*/VESTA_CERTIFICATE='$user:$domain'/g" \
$VESTA/conf/vesta.conf
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,9 +9,9 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
password=$2
password=$2; HIDE=2
email=$3
package=${4-default}
fname=$5
@ -21,16 +21,10 @@ lname=$6
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# Hiding password
A2='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
is_user_free() {
check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" )
check_sysuser=$(cut -f 1 -d : /etc/passwd | grep "^$user$" )
if [ ! -z "$check_sysuser" ] || [ -e "$USER_DATA" ]; then
echo "Error: user $user exists"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
check_result $E_EXISTS "user $user exists"
fi
}
@ -40,12 +34,12 @@ is_user_free() {
#----------------------------------------------------------#
check_args '3' "$#" 'USER PASSWORD EMAIL [PACKAGE] [FNAME] [LNAME]'
validate_format 'user' 'password' 'email' 'package'
is_format_valid 'user' 'email' 'package'
if [ ! -z "$fname" ]; then
validate_format 'fname' 'lname'
is_format_valid 'fname' 'lname'
fi
is_user_free "$user"
is_password_valid
is_package_valid
@ -54,7 +48,7 @@ is_package_valid
#----------------------------------------------------------#
# Parsing package data
pkg_data=$(cat $VESTA/data/packages/$package.pkg |grep -v TIME |grep -v DATE)
pkg_data=$(cat $VESTA/data/packages/$package.pkg |egrep -v "TIME|DATE")
# Checking shell
shell_conf=$(echo "$pkg_data" | grep 'SHELL' | cut -f 2 -d \')
@ -62,11 +56,7 @@ shell=$(grep -w "$shell_conf" /etc/shells |head -n1)
# Adding user
/usr/sbin/useradd "$user" -s "$shell" -c "$email" -m -d "$HOMEDIR/$user"
if [ $? -ne 0 ]; then
echo "Error: user creation failed"
log_event "$E_INVALID" "$EVENT"
exit $E_INVALID
fi
check_result $? "user creation failed" $E_INVALID
# Adding password
echo "$user:$password" | /usr/sbin/chpasswd
@ -75,21 +65,16 @@ echo "$user:$password" | /usr/sbin/chpasswd
mkdir $HOMEDIR/$user/conf
if [ ! -z "$WEB_SYSTEM" ]; then
mkdir $HOMEDIR/$user/conf/web
mkdir $HOMEDIR/$user/web
mkdir $HOMEDIR/$user/tmp
chmod 751 $HOMEDIR/$user/conf/web
chmod 751 $HOMEDIR/$user/web
chmod 771 $HOMEDIR/$user/tmp
chown $user:$user $HOMEDIR/$user/web
chown $user:$user $HOMEDIR/$user/tmp
mkdir $HOMEDIR/$user/conf/web $HOMEDIR/$user/web $HOMEDIR/$user/tmp
chmod 751 $HOMEDIR/$user/conf/web
chmod 700 $HOMEDIR/$user/tmp
chown $user:$user $HOMEDIR/$user/web $HOMEDIR/$user/tmp
fi
if [ ! -z "$MAIL_SYSTEM" ]; then
mkdir $HOMEDIR/$user/conf/mail
mkdir $HOMEDIR/$user/mail
chmod 751 $HOMEDIR/$user/mail
chmod 751 $HOMEDIR/$user/conf/mail
mkdir $HOMEDIR/$user/conf/mail $HOMEDIR/$user/mail
chmod 751 $HOMEDIR/$user/mail
chmod 755 $HOMEDIR/$user/conf/mail
fi
if [ ! -z "$DNS_SYSTEM" ]; then
@ -107,54 +92,51 @@ chattr +i $HOMEDIR/$user/conf
#----------------------------------------------------------#
# Adding user dir
mkdir $USER_DATA
chmod 770 $USER_DATA
mkdir -p $USER_DATA/ssl $USER_DATA/dns $USER_DATA/mail
# Creating configuration files and pipes
touch $USER_DATA/backup.conf
chmod 660 $USER_DATA/backup.conf
touch $USER_DATA/history.log
chmod 660 $USER_DATA/history.log
touch $USER_DATA/stats.log
chmod 660 $USER_DATA/stats.log
touch $USER_DATA/backup.conf \
$USER_DATA/history.log \
$USER_DATA/stats.log \
$USER_DATA/web.conf \
$USER_DATA/dns.conf \
$USER_DATA/mail.conf \
$USER_DATA/db.conf \
$USER_DATA/cron.conf
chmod 770 $USER_DATA \
$USER_DATA/ssl \
$USER_DATA/dns \
$USER_DATA/mail
chmod 660 $USER_DATA/backup.conf \
$USER_DATA/history.log \
$USER_DATA/stats.log \
$USER_DATA/web.conf \
$USER_DATA/dns.conf \
$USER_DATA/mail.conf \
$USER_DATA/db.conf \
$USER_DATA/cron.conf
# Updating queue pipes
echo "$BIN/v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe
if [ ! -z "$WEB_SYSTEM" ]; then
mkdir $USER_DATA/ssl
chmod 770 $USER_DATA/ssl
touch $USER_DATA/web.conf
chmod 660 $USER_DATA/web.conf
echo "$BIN/v-update-web-domains-traff $user" \
>> $VESTA/data/queue/traffic.pipe
echo "$BIN/v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe
fi
if [ ! -z "$DNS_SYSTEM" ]; then
mkdir $USER_DATA/dns
chmod 770 $USER_DATA/dns
touch $USER_DATA/dns.conf
chmod 660 $USER_DATA/dns.conf
fi
if [ ! -z "$MAIL_SYSTEM" ]; then
mkdir $USER_DATA/mail
chmod 770 $USER_DATA/mail
touch $USER_DATA/mail.conf
chmod 660 $USER_DATA/mail.conf
echo "$BIN/v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe
fi
if [ ! -z "$DB_SYSTEM" ]; then
touch $USER_DATA/db.conf
chmod 660 $USER_DATA/db.conf
echo "$BIN/v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe
fi
if [ ! -z "$CRON_SYSTEM" ]; then
touch $USER_DATA/cron.conf
chmod 660 $USER_DATA/cron.conf
fi
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Filling user config
if [ "$user" != 'admin' ]; then
@ -172,7 +154,7 @@ $pkg_data
CONTACT='$email'
CRON_REPORTS='yes'
MD5='$(awk -v user=$user -F : 'user == $1 {print $2}' /etc/shadow)'
RKEY='$(gen_password)'
RKEY='$(generate_password)'
SUSPENDED='no'
SUSPENDED_USERS='0'
SUSPENDED_WEB='0'
@ -201,8 +183,9 @@ U_DATABASES='0'
U_CRON_JOBS='0'
U_BACKUPS='0'
LANGUAGE=''
TIME='$TIME'
DATE='$DATE'" > $USER_DATA/user.conf
NOTIFICATIONS='no'
TIME='$time'
DATE='$date'" > $USER_DATA/user.conf
chmod 660 $USER_DATA/user.conf
# Updating quota
@ -220,8 +203,13 @@ if [ -x "$VESTA/data/packages/$package.sh" ]; then
$VESTA/data/packages/$package.sh "$user" "$email" "$fname" "$lname"
fi
# Adding jailed sftp env
if [ ! -z "$SFTPJAIL_KEY" ]; then
$BIN/v-add-user-sftp-jail $user
fi
# Logging
log_history "added system user $user" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

125
bin/v-add-user-favourites Executable file
View file

@ -0,0 +1,125 @@
#!/bin/bash
# info: adding user favourites
# options: USER SYSTEM OBJECT
#
# The function adds object to users favourites
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
system=$(echo "$2" |tr '[:lower:]' '[:upper:]')
object=$3
email=$3
id=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER SYSTEM OBJECT'
is_format_valid 'user' 'system'
case $system in
MAIL_ACC) is_format_valid 'email' ;;
CRON) is_format_valid 'id' ;;
DNS_REC) is_format_valid 'id' ;;
*) is_format_valid 'object'
esac
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
# Checking system
case $system in
USER) check='ok' ;;
WEB) check='ok' ;;
DNS) check='ok' ;;
DNS_REC) check='ok' ;;
MAIL) check='ok' ;;
MAIL_ACC) check='ok' ;;
DB) check='ok' ;;
CRON) check='ok' ;;
BACKUP) check='ok' ;;
IP) check='ok' ;;
PACKAGE) check='ok' ;;
FIREWALL) check='ok' ;;
*) check_args '2' '0' 'USER SYSTEM OBJECT'
esac
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Flushing vars
USER=''
WEB=''
DNS=''
DNS_REC=''
MAIL=''
MAIL_ACC=''
DB=''
CRON=''
BACKUP=''
IP=''
PACKAGE=''
FIREWALL=''
# Creating config just in case
touch $USER_DATA/favourites.conf
# Reading current values
source $USER_DATA/favourites.conf
# Assigning current system value
eval value=\$$system
# Checking if object is new
check_fav=$(echo "$value" |tr ',' '\n'| grep "^$object$")
if [ ! -z "$check_fav" ]; then
exit 0
fi
# Adding object to favorites
if [ -z "$value" ]; then
value="$object"
else
value="$value,$object"
fi
# Updating sytem
eval $system=$value
# Updating user favorites
echo "USER='$USER'
WEB='$WEB'
DNS='$DNS'
DNS_REC='$DNS_REC'
MAIL='$MAIL'
MAIL_ACC='$MAIL_ACC'
DB='$DB'
CRON='$CRON'
BACKUP='$BACKUP'
IP='$IP'
PACKAGE='$PACKAGE'
FIREWALL='$FIREWALL'" > $USER_DATA/favourites.conf
# Changing file permission
chmod 640 $USER_DATA/favourites.conf
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_history "added starred $object in $system listing"
log_event "$OK" "$ARGUMENTS"
exit

76
bin/v-add-user-notification Executable file
View file

@ -0,0 +1,76 @@
#!/bin/bash
# info: add user notification
# options: USER TOPIC NOTICE [TYPE]
#
# The function adds user notification.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
topic=$(echo $2 |sed "s/'/%quote%/g")
notice=$(echo $3 |sed "s/'/%quote%/g")
type=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER TOPIC NOTICE [TYPE]'
is_format_valid 'user' 'topic' 'notice'
is_object_valid 'user' 'USER' "$user"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining notification id
if [ -e "$USER_DATA/notifications.conf" ]; then
nid=$(grep "NID=" $USER_DATA/notifications.conf |cut -f 2 -d \')
nid=$(echo "$nid" |sort -n |tail -n1)
if [ ! -z "$nid" ]; then
nid="$((nid +1))"
else
nid=1
fi
else
nid=1
fi
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatenating string
str="NID='$nid' TOPIC='$topic' NOTICE='$notice' TYPE='$type'"
str="$str ACK='no' TIME='$time' DATE='$date'"
# Adding to config
echo "$str" >> $USER_DATA/notifications.conf
# Changing permissions
chmod 660 $USER_DATA/notifications.conf
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating notification counter
if [ -z "$(grep NOTIFICATIONS $USER_DATA/user.conf)" ]; then
sed -i "s/^TIME/NOTIFICATIONS='yes'\nTIME/g" $USER_DATA/user.conf
else
update_user_value "$user" '$NOTIFICATIONS' "yes"
fi
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
pkg_dir=$1
package=$2
rewrite=$3
@ -22,24 +22,47 @@ source $VESTA/conf/vesta.conf
is_package_new() {
if [ -e "$VESTA/data/packages/$package.pkg" ]; then
echo "Error: package $package already exists."
log_event "$E_EXISTS" "$EVENT"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi
}
is_package_consistent() {
source $pkg_dir/$package.pkg
validate_format_int $WEB_DOMAINS 'WEB_DOMAINS'
validate_format_int $WEB_ALIASES 'WEB_ALIASES'
validate_format_int $DNS_DOMAINS 'DNS_DOMAINS'
validate_format_int $DNS_RECORDS 'DNS_RECORDS'
validate_format_int $MAIL_DOMAINS 'MAIL_DOMAINS'
validate_format_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS'
validate_format_int $DATABASES 'DATABASES'
validate_format_int $CRON_JOBS 'CRON_JOBS'
validate_format_int $DISK_QUOTA 'DISK_QUOTA'
validate_format_int $BACKUPS 'BACKUPS'
validate_format_shell $SHELL
if [ "$WEB_DOMAINS" != 'unlimited' ]; then
is_int_format_valid $WEB_DOMAINS 'WEB_DOMAINS'
fi
if [ "$WEB_ALIASES" != 'unlimited' ]; then
is_int_format_valid $WEB_ALIASES 'WEB_ALIASES'
fi
if [ "$DNS_DOMAINS" != 'unlimited' ]; then
is_int_format_valid $DNS_DOMAINS 'DNS_DOMAINS'
fi
if [ "$DNS_RECORDS" != 'unlimited' ]; then
is_int_format_valid $DNS_RECORDS 'DNS_RECORDS'
fi
if [ "$MAIL_DOMAINS" != 'unlimited' ]; then
is_int_format_valid $MAIL_DOMAINS 'MAIL_DOMAINS'
fi
if [ "$MAIL_ACCOUNTS" != 'unlimited' ]; then
is_int_format_valid $MAIL_ACCOUNTS 'MAIL_ACCOUNTS'
fi
if [ "$DATABASES" != 'unlimited' ]; then
is_int_format_valid $DATABASES 'DATABASES'
fi
if [ "$CRON_JOBS" != 'unlimited' ]; then
is_int_format_valid $CRON_JOBS 'CRON_JOBS'
fi
if [ "$DISK_QUOTA" != 'unlimited' ]; then
is_int_format_valid $DISK_QUOTA 'DISK_QUOTA'
fi
if [ "$BANDWIDTH" != 'unlimited' ]; then
is_int_format_valid $BANDWIDTH 'BANDWIDTH'
fi
if [ "$BACKUPS" != 'unlimited' ]; then
is_int_format_valid $BACKUPS 'BACKUPS'
fi
is_format_valid_shell $SHELL
}
@ -48,7 +71,7 @@ is_package_consistent() {
#----------------------------------------------------------#
check_args '2' "$#" 'PKG_DIR PACKAGE' 'rewrite'
validate_format 'pkg_dir' 'package'
is_format_valid 'pkg_dir' 'package'
if [ "$rewrite" != 'yes' ]; then
is_package_new
fi
@ -74,6 +97,6 @@ if [ "$rewrite" != 'yes' ]; then
else
log_history "updated user package $package" '' 'admin'
fi
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

66
bin/v-add-user-sftp-jail Executable file
View file

@ -0,0 +1,66 @@
#!/bin/bash
# info: add user sftp jail
# options: USER
#
# The script enables sftp jailed environment
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '1' "$#" 'USER'
is_format_valid 'user'
if [ -z "$SFTPJAIL_KEY" ]; then
exit
fi
user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
if [ -z "$user_str" ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining user homedir
home="$(echo $user_str |cut -f 6 -d :)"
# Adding chroot directory
if [ ! -d "/chroot/$user/$home" ]; then
mkdir -p /chroot/$user/$home
chmod 750 /chroot/$user
chmod 775 /chroot/$user/$home
chown root:sftp-only /chroot/$user
chown $user:sftp-only /chroot/$user/$home
fi
# Adding user to sftp group
usermod -a -G sftp-only $user
# Mouting home directory
if [ -z "$(mount |grep /chroot/$user/$home)" ]; then
mount -o bind $home /chroot/$user/$home/
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

133
bin/v-add-vesta-softaculous Executable file
View file

@ -0,0 +1,133 @@
#!/bin/bash
# info: add vesta softaculous
# options: [TYPE]
#
# The script enables softaculous plugin
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
TYPE=$1
# Includes
source /etc/profile
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
if [ "$TYPE" = 'WEB' ]; then
if [ ! -e "$VESTA/softaculous" ] && [ ! -e "$VESTA/ioncube" ]; then
$BIN/v-schedule-vesta-softaculous
exit
fi
else
cmd="v-add-vesta-softaculous"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
if [ ! -z "$check_cron" ]; then
eval $check_cron
$BIN/v-delete-cron-job admin $JOB
fi
fi
if [ "$SOFTACULOUS" = 'yes' ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Cleaning yum cache
if [ -d "/etc/sysconfig" ]; then
yum -q clean all
yum="yum -q -y --noplugins --disablerepo=* --enablerepo=vesta"
else
export DEBIAN_FRONTEND=noninteractive
apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" \
-o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -qq
fi
# Updating php pacakge
if [ -z "$($VESTA/php/bin/php -v|grep 'PHP 5.6')" ]; then
if [ -d "/etc/sysconfig" ]; then
$yum -y update vesta-php
check_result $? "vesta-php package upgrade failed" $E_UPDATE
else
apt-get -y install vesta-php
check_result $? "vesta-php package upgrade failed" $E_UPDATE
fi
fi
# Adding vesta-ioncube package
if [ -d "/etc/sysconfig" ]; then
rpm -q vesta-ioncube >/dev/null 2>&1
if [ $? -ne 0 ]; then
$yum -y install vesta-ioncube >/dev/null 2>&1
check_result $? "vesta-ioncube package installation failed" $E_UPDATE
fi
else
dpkg -l vesta-ioncube |grep ^ii >/dev/null 2>&1
if [ $? -ne 0 ]; then
apt-get -y install vesta-ioncube >/dev/null 2>&1
check_result $? "vesta-ioncube package installation failed" $E_UPDATE
fi
fi
# Adding vesta-softaculous package
if [ -d "/etc/sysconfig" ]; then
rpm -q vesta-softaculous >/dev/null 2>&1
if [ $? -ne 0 ]; then
$yum -y install vesta-softaculous >/dev/null 2>&1
check_result $? "vesta-softaculous package installation failed" $E_UPDATE
fi
else
dpkg -l vesta-softaculous |grep ^ii >/dev/null 2>&1
if [ $? -ne 0 ]; then
apt-get -y install vesta-softaculous >/dev/null 2>&1
check_result $? "vesta-softaculous package installation failed" $E_UPDATE
fi
fi
# Installing softaculous
if [ ! -e "$VESTA/softaculous/vst_installed" ]; then
mkdir -p /var/softaculous
chown -R admin:admin /var/softaculous
cd $VESTA/softaculous
wget -q http://c.vestacp.com/3rdparty/softaculous_install.inc
$VESTA/php/bin/php softaculous_install.inc
check_result $? "vesta-softaculous package installation failed" $E_UPDATE
touch $VESTA/softaculous/vst_installed
fi
# Enabling symlink
if [ -e "$VESTA/disabled_plugins/softaculous" ]; then
if [ ! -e "$VESTA/web/softaculous" ]; then
mv $VESTA/disabled_plugins/softaculous $VESTA/web/softaculous
fi
fi
# Updating SOFTACULOUS value
if [ -z "$(grep SOFTACULOUS $VESTA/conf/vesta.conf)" ]; then
echo "SOFTACULOUS='yes'" >> $VESTA/conf/vesta.conf
else
sed -i "s/SOFTACULOUS.*/SOFTACULOUS='yes'/g" \
$VESTA/conf/vesta.conf
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,27 +1,28 @@
#!/bin/bash
# info: add web domain
# options: USER DOMAIN IP [RESTART]
# options: USER DOMAIN [IP] [ALIASES] [PROXY_EXTENSIONS] [RESTART]
#
# The function adds virtual host to a server. In cases when a template is
# undefined in the script, the template "default" will be used. The alias of
# www.domain.tld type will be automatically assigned to the domain. If ip have
# assocated dns name, this domain will also get the alias domain-tpl.$ipname.
# An alias with the ip name is useful during the site testing while dns isn't
# moved to a server yet.
# The function adds virtual host to a server. In cases when ip is
# undefined in the script, "default" template will be used. The alias of
# www.domain.tld type will be automatically assigned to the domain unless
# "none" is transmited as argument. If ip have associated dns name, this
# domain will also get the alias domain-tpl.$ipname. An alias with the ip
# name is useful during the site testing while dns isn't moved to server yet.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
ip=$3
restart=$4
restart=$4 # will be moved to the end soon
aliases=$5
proxy_ext=$6
# Includes
source $VESTA/func/main.sh
@ -29,62 +30,42 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
format_aliases
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN IP [RESTART]'
validate_format 'user' 'domain' 'ip'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
check_args '2' "$#" 'USER DOMAIN [IP] [RESTART] [ALIASES] [PROXY_EXTENSIONS]'
is_format_valid 'user' 'domain' 'aliases' 'ip' 'proxy_ext'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_domain_new 'web'
is_ip_valid
is_ip_avalable
is_package_full 'WEB_DOMAINS'
template=$(get_user_value '$WEB_TEMPLATE')
is_web_template_valid
is_package_full 'WEB_DOMAINS' 'WEB_ALIASES'
is_domain_new 'web' "$domain,$aliases"
is_dir_symlink $HOMEDIR/$user/web
if_dir_exists $HOMEDIR/$user/web/$domain
is_dir_symlink $HOMEDIR/$user/web/$domain
if [ ! -z "$ip" ]; then
is_ip_valid "$ip" "$user"
else
get_user_ip
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Define real ip in case of NAT
IP=$ip
ip=$(get_real_ip $ip)
# Reading user values
source $USER_DATA/user.conf
# Defining domain aliases
ip_name=$(get_ip_name)
ip_name_idn=$(idn -t --quiet -a "$ip_name")
domain_alias="www.$domain"
domain_alias_idn="www.$domain_idn"
if [ ! -z "$ip_name" ]; then
domain_alias_dash="${domain//./-}.$ip_name"
domain_alias_dash_idn="${domain_idn//./-}.$ip_name_idn"
aliases="$domain_alias,$domain_alias_dash"
aliases_idn="$domain_alias_idn,$domain_alias_dash_idn"
alias_string="ServerAlias $domain_alias_idn $domain_alias_dash_idn"
else
aliases="$domain_alias"
aliases_idn="$domain_alias_idn"
alias_string="ServerAlias $domain_alias_idn"
fi
# Defining vars for add_config function
group="$user"
email="info@$domain"
docroot="$HOMEDIR/$user/web/$domain/public_html"
tpl_file="$WEBTPL/$WEB_SYSTEM/$template.tpl"
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
# Adding web config
add_web_config
# Building directory tree
mkdir -p $HOMEDIR/$user/web/$domain \
# Creating domain directories
sudo -u $user mkdir -p $HOMEDIR/$user/web/$domain \
$HOMEDIR/$user/web/$domain/public_html \
$HOMEDIR/$user/web/$domain/public_shtml \
$HOMEDIR/$user/web/$domain/document_errors \
@ -93,63 +74,74 @@ mkdir -p $HOMEDIR/$user/web/$domain \
$HOMEDIR/$user/web/$domain/stats \
$HOMEDIR/$user/web/$domain/logs
# Adding domain logs
# Creating domain logs
touch /var/log/$WEB_SYSTEM/domains/$domain.bytes \
/var/log/$WEB_SYSTEM/domains/$domain.log \
/var/log/$WEB_SYSTEM/domains/$domain.error.log
# Adding symlink for logs
ln -f -s /var/log/$WEB_SYSTEM/domains/$domain.*log \
$HOMEDIR/$user/web/$domain/logs/
# Adding domain skeleton
if [ -e "$WEBTPL/skel/public_html/" ]; then
cp -r $WEBTPL/skel/public_html/ $HOMEDIR/$user/web/$domain/
fi
if [ -e "$WEBTPL/skel/public_shtml/" ]; then
cp -r $WEBTPL/skel/public_shtml/ $HOMEDIR/$user/web/$domain/
fi
if [ -e "$WEBTPL/skel/document_errors/" ]; then
cp -r $WEBTPL/skel/document_errors/ $HOMEDIR/$user/web/$domain/
fi
if [ -e "$WEBTPL/skel/cgi-bin/" ]; then
cp -r $WEBTPL/skel/cgi-bin/ $HOMEDIR/$user/web/$domain/
fi
# Changing tpl values
sudo -u $user cp -r $WEBTPL/skel/* $HOMEDIR/$user/web/$domain/ >/dev/null 2>&1
for file in $(find "$HOMEDIR/$user/web/$domain/" -type f); do
sed -i "s/%domain%/$domain/g" $file
done
# Changing file owner
# Changing file owner & permission
chown -R $user:$user $HOMEDIR/$user/web/$domain
chown root:$user /var/log/$WEB_SYSTEM/domains/$domain.*
chown root:$user $conf
# Changing file permissions
chmod 640 $conf
chmod 551 $HOMEDIR/$user/web/$domain
chmod 751 $HOMEDIR/$user/web/$domain/private
chmod 751 $HOMEDIR/$user/web/$domain/cgi-bin
chmod 751 $HOMEDIR/$user/web/$domain/public_html
chmod 751 $HOMEDIR/$user/web/$domain/public_shtml
chmod 751 $HOMEDIR/$user/web/$domain/document_errors
chmod -f -R 665 $HOMEDIR/$user/web/$domain/cgi-bin/*
chmod -f -R 665 $HOMEDIR/$user/web/$domain/public_html/*
chmod -f -R 665 $HOMEDIR/$user/web/$domain/document_errors/*
chmod 551 $HOMEDIR/$user/web/$domain/stats
chmod 551 $HOMEDIR/$user/web/$domain/logs
chown root:$user /var/log/$WEB_SYSTEM/domains/$domain.* $conf
chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
sudo -u $user chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/*
sudo -u $user chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
sudo -u $user chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*.*
# Running template trigger
if [ -x $WEBTPL/$WEB_SYSTEM/$template.sh ]; then
$WEBTPL/$WEB_SYSTEM/$template.sh $user $domain $ip $HOMEDIR $docroot
# Addding PHP-FPM backend
if [ ! -z "$WEB_BACKEND" ]; then
if [ -z "$BACKEND_TEMPLATE" ]; then
BACKEND_TEMPLATE='default'
if [ -z "$(grep BACKEND_TEMPLATE $USER_DATA/user.conf)" ]; then
sed -i "s/^DNS_TEMPL/BACKEND_TEMPLATE='default'\nDNS_TEMPL/g" \
$USER_DATA/user.conf
else
update_user_value "$user" '$BACKEND_TEMPLATE' "default"
fi
fi
$BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE
check_result $? "Backend error" >/dev/null
fi
# Checking web config
web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
if [ -z "$(grep $conf $web_conf)" ]; then
echo "Include $conf" >> $web_conf
# Preparing domain aliases
if [ "$aliases" = 'none' ]; then
ALIAS=''
else
ALIAS="www.$domain"
if [ -z "$aliases" ]; then
ALIAS="www.$domain"
else
ALIAS="$aliases"
fi
ip_alias=$(get_ip_alias $domain)
if [ ! -z "$ip_alias" ]; then
ALIAS="$ALIAS,$ip_alias"
fi
fi
# Preparing domain variables
prepare_web_domain_values
# Adding web server config
add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl"
# Adding proxy config
if [ ! -z "$PROXY_SYSTEM" ]; then
PROXY_EXT="$proxy_ext"
if [ -z "$proxy_ext" ]; then
PROXY_EXT="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls"
PROXY_EXT="$PROXY_EXT,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp"
PROXY_EXT="$PROXY_EXT,rtf,js,mp3,avi,mpeg,flv,html,htm"
fi
add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl"
fi
@ -158,31 +150,32 @@ fi
#----------------------------------------------------------#
# Increasing counters
increase_ip_value "$ip"
increase_ip_value "$local_ip"
increase_user_value "$user" '$U_WEB_DOMAINS'
increase_user_value "$user" '$U_WEB_ALIASES'
increase_user_value "$user" '$U_WEB_ALIASES' "$alias_number"
# Defining domain variables
str="DOMAIN='$domain' IP='$IP' IP6='' ALIAS='$aliases' TPL='$template'"
str="$str SSL='no' SSL_HOME='same' FTP_USER='' FTP_MD5=''"
str="$str PROXY='' PROXY_EXT='' STATS='' STATS_USER=''"
str="$str STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0' SUSPENDED='no'"
str="$str TIME='$TIME' DATE='$DATE'"
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Registering domain
echo "$str" >> $USER_DATA/web.conf
chmod 660 $USER_DATA/web.conf
# Adding domain in web.conf
echo "DOMAIN='$domain' IP='$ip' IP6='' ALIAS='$ALIAS' TPL='$WEB_TEMPLATE'\
SSL='no' SSL_HOME='same' LETSENCRYPT='no' FTP_USER='' FTP_MD5=''\
BACKEND='$BACKEND_TEMPLATE' PROXY='$PROXY_TEMPLATE' PROXY_EXT='$PROXY_EXT'\
STATS='' STATS_USER='' STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0'\
SUSPENDED='no' TIME='$time' DATE='$date'" >> $USER_DATA/web.conf
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v-restart-web
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting web server
$BIN/v-restart-web $restart
check_result $? "Web restart failed" >/dev/null
# Restarting proxy server
$BIN/v-restart-proxy $restart
check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "added web domain $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: add web domain alias
# options: USER DOMAIN ALIAS [RESTART]
# options: USER DOMAIN ALIASES [RESTART]
#
# The call is intended for adding aliases to a domain (it is also called
# "domain parking"). The function supports wildcards *.domain.tpl.
@ -10,15 +10,11 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
dom_alias=$(idn -t --quiet -u "$3" )
dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g')
dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
domain=$2
domain_idn=$2
aliases=$3
restart="$4"
# Includes
@ -27,19 +23,25 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
format_aliases
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN DOM_ALIAS [RESTART]'
validate_format 'user' 'domain' 'dom_alias'
check_args '3' "$#" 'USER DOMAIN ALIASES [RESTART]'
is_format_valid 'user' 'domain' 'dom_alias'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
is_domain_new 'web' "$dom_alias"
is_domain_new 'web' "$aliases"
is_package_full 'WEB_ALIASES'
@ -49,43 +51,31 @@ is_package_full 'WEB_ALIASES'
# Parsing domain values
get_domain_values 'web'
tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
ip=$(get_real_ip $IP)
# Parsing domain aliases
if [ -z "$ALIAS" ]; then
ALIAS="$dom_alias"
else
ALIAS="$ALIAS,$dom_alias"
fi
# Preparing domain values for the template substitution
upd_web_domain_values
# Recreating vhost
del_web_config
add_web_config
local_ip=$(get_real_ip $IP)
if [ -z "$ALIAS" ]; then
ALIAS="$aliases"
else
ALIAS="$ALIAS,$aliases"
fi
prepare_web_domain_values
# Rebuilding vhost
del_web_config "$WEB_SYSTEM" "$TPL.tpl"
add_web_config "$WEB_SYSTEM" "$TPL.tpl"
if [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
del_web_config
add_web_config
del_web_config "$WEB_SYSTEM" "$TPL.stpl"
add_web_config "$WEB_SYSTEM" "$TPL.stpl"
fi
# Checking proxy
if [ ! -z "$PROXY" ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
del_web_config
add_web_config
# Rebuilding proxy configuration
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
add_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
if [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
del_web_config
add_web_config
del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
add_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
fi
fi
@ -96,24 +86,18 @@ fi
# Adding new alias
update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS"
# Update counters
increase_user_value "$user" '$U_WEB_ALIASES'
# Adding task to the vesta pipe
if [ "$restart" != 'no' ]; then
$BIN/v-restart-web
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
# Restarting web server
$BIN/v-restart-web $restart
check_result $? "Web restart failed" >/dev/null
$BIN/v-restart-proxy
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting proxy server
$BIN/v-restart-proxy $restart
check_result $? "Proxy restart failed" >/dev/null
log_history "added $dom_alias as alias for $domain"
log_event "$OK" "$EVENT"
log_history "added $aliases for $domain"
log_event "$OK" "$ARGUMENTS"
exit

77
bin/v-add-web-domain-backend Executable file
View file

@ -0,0 +1,77 @@
#!/bin/bash
# info: add web domain backend
# options: USER DOMAIN [TEMPLATE] [RESTART]
#
# The call is used for adding web backend configuration.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
domain=$2
template=${3-default}
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [RESTART]'
is_system_enabled "$WEB_BACKEND" 'WEB_BACKEND'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_backend_template_valid "$template"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining pool directory
prepare_web_backend
# Checking backend configuration
if [ -e "$pool/$backend_type.conf" ]; then
exit
fi
# Allocating backend port
backend_port=9000
ports=$(grep listen $pool/* 2>/dev/null |grep -o :[0-9].*)
ports=$(echo "$ports" |sed "s/://" |sort -n)
for port in $ports; do
if [ "$backend_port" -eq "$port" ]; then
backend_port=$((backend_port + 1))
fi
done
# Adding backend config
cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
sed -e "s|%backend_port%|$backend_port|" \
-e "s|%user%|$user|g"\
-e "s|%domain%|$domain|g"\
-e "s|%backend%|$backend_type|g" > $pool/$backend_type.conf
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Restart backend server
$BIN/v-restart-web-backend $restart
check_result $? "Web backend restart failed" >/dev/null
# Logging
log_history "added $WEB_BACKEND backend configuration for $domain"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,12 +9,12 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
ftp_user=${1}_${3}
ftp_password=$4
password=$4; HIDE=4
ftp_path=$5
# Includes
@ -22,9 +22,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
@ -32,7 +33,7 @@ EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN FTP_USER FTP_PASSWORD [FTP_PATH]'
validate_format 'user' 'domain' 'ftp_user' 'ftp_password'
is_format_valid 'user' 'domain' 'ftp_user'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -41,9 +42,10 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
check_ftp_user=$(grep "^$ftp_user:" /etc/passwd)
if [ ! -z "$check_ftp_user" ] && [ "$FTP_USER" != "$ftp_user" ]; then
echo "Error: ftp user $ftp_user already exists"
log_event "$E_EXISTS" "$EVENT"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi
is_password_valid
#----------------------------------------------------------#
@ -54,12 +56,8 @@ fi
get_domain_values 'web'
# Defining ftp user shell
if [ -z "$FTP_SHELL" ]; then
shell='/sbin/nologin'
if [ -e "/usr/bin/rssh" ]; then
shell='/usr/bin/rssh'
fi
else
shell=$(which nologin)
if [ ! -z "$FTP_SHELL" ]; then
shell=$FTP_SHELL
fi
@ -71,7 +69,7 @@ else
ftp_path_a=$(readlink -f "$HOMEDIR/$user/web/$domain/$ftp_path")
if [ -z "$(echo $ftp_path_a |grep $HOMEDIR/$user/web/$domain)" ]; then
echo "Error: absolute path $ftp_path_a is invalid"
log_event "$E_INVALID" "$EVENT"
log_event "$E_INVALID" "$ARGUMENTS"
exit $E_INVALID
fi
# Creating ftp user home directory
@ -86,13 +84,18 @@ fi
/usr/sbin/useradd $ftp_user \
-s $shell \
-o -u $(id -u $user) \
-g $(id -u $user) \
-g $(id -g $user) \
-M -d "$ftp_path_a" > /dev/null 2>&1
# Set ftp user password
echo "$ftp_user:$ftp_password" | /usr/sbin/chpasswd
echo "$ftp_user:$password" | /usr/sbin/chpasswd
ftp_md5=$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)
# Adding jailed sftp env
if [ ! -z "$SFTPJAIL_KEY" ]; then
$BIN/v-add-user-sftp-jail $ftp_user
fi
#----------------------------------------------------------#
# Vesta #
@ -118,6 +121,6 @@ update_object_value 'web' 'DOMAIN' "$domain" '$FTP_PATH' "$ftp_path"
# Logging
log_history "added ftp account ${1}_${3}@$domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

115
bin/v-add-web-domain-httpauth Executable file
View file

@ -0,0 +1,115 @@
#!/bin/bash
# info: add password protection for web domain
# options: USER DOMAIN AUTH_USER AUTH_PASSWORD [RESTART]
#
# The call is used for securing web domain with http auth
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
user=$1
domain=$2
auth_user=$3
password=$4; HIDE=4
restart=${5-yes}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Defining htpasswd file
htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess"
htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
shtaccess="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf_htaccess"
shtpasswd="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.htpasswd"
docroot="$HOMEDIR/$user/web/$domain/public_html"
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN AUTH_USER AUTH_PASSWORD [RESTART]'
is_format_valid 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
is_password_valid
get_domain_values 'web'
if [ ! -z "$(echo "$AUTH_USER" |tr : '\n' |grep ^$auth_user$)" ]; then
echo "Error: auth user $auth_user already exists"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Adding htaccess password protection
if [ ! -e "$htaccess" ]; then
if [ "$WEB_SYSTEM" != 'nginx' ]; then
echo "<Directory $docroot>" > $htaccess
echo " AuthUserFile $htpasswd" >> $htaccess
echo " AuthName \"$domain access\"" >> $htaccess
echo " AuthType Basic" >> $htaccess
echo " Require valid-user" >> $htaccess
echo "</Directory>" >> $htaccess
else
echo "auth_basic \"$domain password access\";" > $htaccess
echo "auth_basic_user_file $htpasswd;" >> $htaccess
fi
restart_required='yes'
fi
# Adding httpasswd user
auth_hash=$($BIN/v-generate-password-hash htpasswd htpasswd $password)
touch $htpasswd
chmod 640 $htpasswd $htaccess
chgrp $user $htpasswd $htaccess
sed -i "/^$auth_user:/d" $htpasswd
echo "$auth_user:$auth_hash" >> $htpasswd
# Symbolic link for secure web templates
if [ ! -L $shtpasswd ]; then
ln -s $htpasswd $shtpasswd
fi
if [ ! -L $shtaccess ]; then
ln -s $htaccess $shtaccess
fi
# Restarting web server
if [ "$restart" != 'no' ] && [ "$restart_required" = 'yes' ]; then
$BIN/v-restart-web
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Preparing web.conf keys
if [ ! -z "$AUTH_USER" ]; then
auth_user="$AUTH_USER:$auth_user"
auth_hash="$AUTH_HASH:$auth_hash"
else
# Adding new key into web.conf
add_object_key "web" 'DOMAIN' "$domain" 'AUTH_USER' 'U_DISK'
add_object_key "web" 'DOMAIN' "$domain" 'AUTH_HASH' 'U_DISK'
fi
# Updating config
update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_USER' "$auth_user"
update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_HASH' "$auth_hash"
# Logging
log_history "added http auth user $httpauth_user on $domain"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -10,10 +10,9 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
template=$3
default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"
@ -32,7 +31,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [EXTENTIONS] [RESTART]'
validate_format 'user' 'domain' 'extentions'
is_format_valid 'user' 'domain' 'extentions'
is_system_enabled "$PROXY_SYSTEM" 'PROXY_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -42,7 +41,7 @@ is_object_value_empty 'web' 'DOMAIN' "$domain" '$PROXY'
if [ -z $template ]; then
template=$(get_user_value '$PROXY_TEMPLATE')
fi
is_proxy_template_valid
is_proxy_template_valid $template
#----------------------------------------------------------#
@ -51,44 +50,16 @@ is_proxy_template_valid
# Defining domain parameters
get_domain_values 'web'
PROXY="$template"
PROXY_EXT="$extentions"
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
ip=$(get_real_ip $IP)
prepare_web_domain_values
local_ip=$(get_real_ip $IP)
# Preparing domain values for the template substitution
upd_web_domain_values
add_web_config
PROXY_EXT="$extentions"
add_web_config "$PROXY_SYSTEM" "$template.tpl"
# Set permission and ownership
chown root:$user $conf
chmod 640 $conf
# Checking proxy config
proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
if [ -z "$(grep "$conf" $proxy_conf)" ]; then
echo "include $conf;" >> $proxy_conf
fi
# Checking ssl
# Adding proxy for ssl
if [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
add_web_config
chown root:$user $conf
chmod 640 $conf
proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
if [ -z "$(grep "$conf" $proxy_conf)" ]; then
echo "include $conf;" >> $proxy_conf
fi
fi
# Running template trigger
if [ -x $WEBTPL/$PROXY_SYSTEM/$template.sh ]; then
$WEBTPL/$PROXY_SYSTEM/$template.sh $user $domain $ip $HOMEDIR $docroot
add_web_config "$PROXY_SYSTEM" "$template.stpl"
fi
@ -97,18 +68,14 @@ fi
#----------------------------------------------------------#
# Update config
update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$PROXY"
update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$template"
update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v-restart-proxy
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting web server
$BIN/v-restart-proxy $restart
check_result $? "Proxy restart failed" >/dev/null
log_history "enabled proxy support for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -14,27 +14,44 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
ssl_dir=$3
ssl_home=${4-same}
restart="$5"
# Additional argument formatting
if [[ "$domain" =~ [[:upper:]] ]]; then
domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
fi
if [[ "$domain" =~ ^www\..* ]]; then
domain=$(echo "$domain" |sed -e "s/^www.//")
fi
if [[ "$domain" =~ .*\.$ ]]; then
domain=$(echo "$domain" |sed -e "s/\.$//")
fi
domain=$(idn -t --quiet -u "$domain" )
domain_idn=$(idn -t --quiet -a "$domain")
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN SSL_DIR [SSL_HOME] [RESTART]'
validate_format 'user' 'domain' 'ssl_dir'
is_format_valid 'user' 'domain' 'ssl_dir'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_system_enabled "$WEB_SSL" 'SSL_SUPPORT'
is_object_valid 'user' 'USER' "$user"
@ -60,22 +77,6 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
fi
chmod 660 $USER_DATA/ssl/$domain.*
# Parsing domain values
get_domain_values 'web'
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
SSL_HOME="$ssl_home"
ip=$(get_real_ip $IP)
# Preparing domain values for the template substitution
upd_web_domain_values
# Adding domain to the web config
add_web_config
chown root:$user $conf
chmod 640 $conf
# Adding certificate to user dir
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
@ -84,31 +85,20 @@ if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
fi
# Running template trigger
if [ -x $WEBTPL/$WEB_SYSTEM/$template.sh ]; then
$WEBTPL/$WEB_SYSTEM/$template.sh $user $domain $ip $HOMEDIR $sdocroot
fi
# Parsing domain values
get_domain_values 'web'
local_ip=$(get_real_ip $IP)
# Checking web config
web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
if [ -z "$(grep "$conf" $web_conf)" ]; then
echo "Include $conf" >> $web_conf
fi
# Preparing domain values for the template substitution
SSL_HOME="$ssl_home"
prepare_web_domain_values
# Checking proxy
if [ ! -z "$PROXY" ]; then
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
add_web_config
# Adding domain to the web config
add_web_config "$WEB_SYSTEM" "$TPL.stpl"
chown root:$user $conf
chmod 640 $conf
# Checking proxy config
proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
if [ -z "$(grep "$conf" $proxy_conf )" ]; then
echo "include $conf;" >> $proxy_conf
fi
# Checking proxy config
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
add_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
fi
@ -123,21 +113,44 @@ increase_user_value "$user" '$U_WEB_SSL'
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v-restart-web
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
# Restarting web server
$BIN/v-restart-web $restart
check_result $? "Web restart failed" >/dev/null
$BIN/v-restart-proxy
if [ $? -ne 0 ]; then
exit $E_RESTART
$BIN/v-restart-proxy $restart
check_result $? "Proxy restart failed" >/dev/null
# Updating system ssl dependencies
if [ ! -z "$VESTA_CERTIFICATE" ]; then
crt_user=$(echo "$VESTA_CERTIFICATE" |cut -f 1 -d :)
crt_domain=$(echo "$VESTA_CERTIFICATE" |cut -f 2 -d :)
if [ "$user" = "$crt_user" ] && [ "$domain" = "$crt_domain" ]; then
$BIN/v-add-sys-vesta-ssl $user $domain >/dev/null 2>&1
fi
fi
if [ ! -z "$MAIL_CERTIFICATE" ]; then
crt_user=$(echo "$MAIL_CERTIFICATE" |cut -f 1 -d :)
crt_domain=$(echo "$MAIL_CERTIFICATE" |cut -f 2 -d :)
if [ "$user" = "$crt_user" ] && [ "$domain" = "$crt_domain" ]; then
$BIN/v-add-sys-mail-ssl $user $domain >/dev/null 2>&1
fi
fi
if [ ! -z "$UPDATE_HOSTNAME_SSL" ] && [ "$UPDATE_HOSTNAME_SSL" = "yes" ]; then
hostname=$(hostname)
if [ "$hostname" = "$domain" ]; then
$BIN/v-update-host-certificate $user $domain
fi
fi
UPDATE_SSL_SCRIPT=''
source $VESTA/conf/vesta.conf
if [ ! -z "$UPDATE_SSL_SCRIPT" ]; then
eval "$UPDATE_SSL_SCRIPT $user $domain"
fi
# Logging
log_history "enabled ssl support for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -13,10 +13,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
type=$3
# Includes
@ -24,13 +24,17 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN TYPE'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_type_valid "$STATS_SYSTEM" "$type"
is_object_valid 'user' 'USER' "$user" "$user"
@ -47,10 +51,8 @@ is_object_value_empty 'web' 'DOMAIN' "$domain" '$STATS'
# Parse aliases
get_domain_values 'web'
# Preparing domain values for the template substitution
upd_web_domain_values
# Adding statistic config
prepare_web_domain_values
cat $WEBTPL/$type/$type.tpl |\
sed -e "s|%ip%|$ip|g" \
-e "s|%web_port%|$WEB_PORT|g" \
@ -90,7 +92,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
# Logging
log_history "enabled web log analyzer for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
# Build stats
exec $BIN/v-update-web-domain-stat $user $domain

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: add password protection to web domain statistics
# options: USER DOMAIN STATS_USER STATS_PASSWORD
# options: USER DOMAIN STATS_USER STATS_PASSWORD [RESTART]
#
# The call is used for securing the web statistics page.
@ -9,52 +9,57 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$2
stats_user=$3
stats_pass=$4
password=$4; HIDE=4
restart=$5
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN STATS_USER STATS_PASS'
validate_format 'user' 'domain' 'stats_user' 'stats_pass'
check_args '4' "$#" 'USER DOMAIN STATS_USER STATS_PASS [RESTART]'
is_format_valid 'user' 'domain' 'stats_user'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
is_password_valid
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Definining statistic dir
# Defining statistic dir
stats_dir="$HOMEDIR/$user/web/$domain/stats"
conf_dir="$HOMEDIR/$user/conf/web"
# Adding htaccess file
echo "AuthUserFile $stats_dir/.htpasswd
AuthName \"Web Statistics\"
AuthType Basic
Require valid-user" > $stats_dir/.htaccess
if [ "$WEB_SYSTEM" = 'nginx' ]; then
echo "auth_basic \"Web Statistics\";" > $conf_dir/$domain.auth
echo "auth_basic_user_file $stats_dir/.htpasswd;" >> $conf_dir/$domain.auth
else
echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess
echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess
echo "AuthType Basic" >> $stats_dir/.htaccess
echo "Require valid-user" >> $stats_dir/.htaccess
fi
# Generating htaccess user and password
rm -f $stats_dir/.htpasswd
htpasswd -bc $stats_dir/.htpasswd "$stats_user" "$stats_pass" &>/dev/null
stats_crypt=$(grep $stats_user: $stats_dir/.htpasswd |cut -f 2 -d :)
salt=$(generate_password "$PW_MATRIX" "8")
stats_pass=$($BIN/v-generate-password-hash md5 $salt $password)
echo "$stats_user:$stats_pass" > $stats_dir/.htpasswd
#----------------------------------------------------------#
# Vesta #
@ -62,10 +67,16 @@ stats_crypt=$(grep $stats_user: $stats_dir/.htpasswd |cut -f 2 -d :)
# Adding stats user in config
update_object_value 'web' 'DOMAIN' "$domain" '$STATS_USER' "$stats_user"
update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_crypt"
update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_pass"
# Restarting web server
if [ "$WEB_SYSTEM" = 'nginx' ]; then
$BIN/v-restart-web $restart
check_result $? "Web restart failed" >/dev/null
fi
# Logging
log_history "added password protection for web stats on $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

File diff suppressed because it is too large Load diff

View file

@ -9,8 +9,8 @@
# Variable&Function #
#----------------------------------------------------------#
# Importing system enviroment as we run this script
# mostly by cron wich not read it by itself
# Importing system environment as we run this script
# mostly by cron which not read it by itself
source /etc/profile
# Includes
@ -22,7 +22,15 @@ source $VESTA/conf/vesta.conf
# Action #
#----------------------------------------------------------#
for user in $(ls $VESTA/data/users); do
$BIN/v-check-vesta-license >/dev/null
if [ -z "$BACKUP_SYSTEM" ]; then
exit
fi
for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then
continue;
fi
check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
log=$VESTA/log/backup.log
if [ ! -z "$check_suspend" ]; then
@ -39,6 +47,6 @@ done
#----------------------------------------------------------#
# No Logging
#log_event "$OK" "$EVENT"
#log_event "$OK" "$ARGUMENTS"
exit

View file

@ -10,7 +10,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
job=$2
min=$3
@ -30,21 +30,27 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '7' "$#" 'USER JOB MIN HOUR DAY MONTH WDAY COMMAND'
validate_format 'user' 'job' 'min' 'hour' 'day' 'month' 'wday' 'command'
is_format_valid 'user' 'job' 'min' 'hour' 'day' 'month' 'wday' 'command'
is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'cron' 'JOB' "$job"
is_object_unsuspended 'cron' 'JOB' "$job"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatenating cron string
command=$(echo $command | sed -e "s/'/%quote%/g")
str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month' WDAY='$wday'"
str="$str CMD='$command' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
str="$str CMD='$command' SUSPENDED='no' TIME='$time' DATE='$date'"
# Deleting old job
sed -i "/JOB='$job' /d" $USER_DATA/cron.conf
@ -63,14 +69,12 @@ sync_cron_jobs
# Vesta #
#----------------------------------------------------------#
# Restart crond
# Restarting crond
$BIN/v-restart-cron
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
check_result $? "Cron restart failed" >/dev/null
# Logging
log_history "changed cron job $job"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -0,0 +1,68 @@
#!/bin/bash
# info: change database server password
# options: TYPE HOST USER PASSWORD
#
# The function changes database server password.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
type=$1
host=$2
dbuser=$3
password=$4; HIDE=4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
args_usage='TYPE HOST DBUSER DBPASS'
check_args '4' "$#" "$args_usage"
is_format_valid 'host' 'dbuser'
is_object_valid "../../conf/$type" 'HOST' "$host"
dbpass="$password"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Define email
email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f2 -d \')
subj="v-change-database-host-password $*"
case $type in
mysql) mysql_connect $host;
query="USE mysql; UPDATE user SET"
query="$query password=PASSWORD('$dbpass')"
query="$query WHERE User='$dbuser';"
query="$query FLUSH PRIVILEGES;"
mysql_query "$query" ;
if [ "$dbuser" == "root" ]; then
echo -e "[client]\npassword='$dbpass'\n" > /root/.my.cnf
chmod 600 /root/.my.cnf
fi;;
pgsql) echo "TBD" >/dev/null;;
esac
update_object_value "../../conf/$type" 'HOST' "$host" '$USER' "$dbuser"
update_object_value "../../conf/$type" 'HOST' "$host" '$PASSWORD' "$dbpass"
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,5 +1,5 @@
#!/bin/bash
# info: change database password
# info: change database owner
# options: DATABASE USER
#
# The function for changing database owner.
@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
database=$1
user=$2
@ -25,7 +25,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'DATABASE USER'
validate_format 'database' 'user'
is_format_valid 'database' 'user'
is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -34,7 +34,7 @@ is_object_unsuspended 'user' 'USER' "$user"
owner=$(echo $database | cut -f 1 -d '_')
if [ ! -e "$VESTA/data/users/$owner" ]; then
echo "Error: database owner doesn't exist"
log_event "$E_NOTEXIST" "$EVENT"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
fi
@ -47,7 +47,7 @@ fi
db_data=$(grep "DB='$database'" $VESTA/data/users/$owner/db.conf)
if [ -z "$db_data" ]; then
echo "Error: database $database doesn't exist"
log_event "$E_NOTEXIST" "$EVENT"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
fi
@ -56,7 +56,7 @@ new_db=$(echo $database | sed "s/^${owner}_/${user}_/")
check_db=$(grep "DB='$new_db'" $VESTA/data/users/$user/db.conf)
if [ ! -z "$check_db" ]; then
echo "Error: $new_db database exists"
log_event "$E_EXISTS" "$EVENT"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi
@ -69,7 +69,7 @@ fi
tmpdir=$(mktemp -p $BACKUP -d)
if [ "$?" -ne 0 ]; then
echo "Error: can't create $tmpdir"
log_event "$E_NOTEXIST" "$EVENT"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
fi
@ -80,7 +80,6 @@ $BIN/v-suspend-database $owner $database > /dev/null 2>&1
eval $db_data
dump="$tmpdir/$database.$TYPE.sql"
grants="$tmpdir/$database.$TYPE.$DBUSER"
send_mail='/bin/true'
case $TYPE in
mysql) dump_mysql_database ;;
pgsql) dump_pgsql_database ;;
@ -120,6 +119,6 @@ $BIN/v-update-user-counters $user
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -10,33 +10,30 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
database=$2
dbpass=$3
password=$3; HIDE=3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
# Hiding password
A3='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DATABASE DBPASS'
validate_format 'user' 'database' 'dbpass'
is_format_valid 'user' 'database'
is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'db' 'DB' "$database"
is_object_unsuspended 'db' 'DB' "$database"
is_password_valid
dbpass="$password"
#----------------------------------------------------------#
# Action #
@ -59,6 +56,6 @@ update_object_value 'db' 'DB' "$database" '$MD5' "$md5"
# Logging
log_history "changed $database database password"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,11 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
database=$2
dbuser="$user"_"$3"
dbpass=$4
password=$4; HIDE=4
# Includes
source $VESTA/func/main.sh
@ -21,25 +21,25 @@ source $VESTA/func/db.sh
source $VESTA/func/rebuild.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DATABASE DBUSER [DBPASS]'
validate_format 'user' 'database' 'dbuser'
if [ ! -z "$dbpass" ]; then
validate_format 'dbpass'
fi
is_format_valid 'user' 'database' 'dbuser'
is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'db' 'DB' "$database"
is_object_unsuspended 'db' 'DB' "$database"
is_password_valid
dbpass="$password"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Compare old and new user
old_dbuser=$(get_object_value 'db' 'DB' "$database" '$DBUSER')
@ -47,11 +47,6 @@ if [ "$old_dbuser" = "$dbuser" ]; then
exit
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Set new dbuser
update_object_value 'db' 'DB' "$database" '$DBUSER' "$dbuser"
@ -91,6 +86,6 @@ fi
# Logging
log_history "changed $database database user to $dbuser"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,5 +1,5 @@
#!/bin/bash
# info: change dns domain expiriation date
# info: change dns domain expiration date
# options: USER DOMAIN EXP
#
# The function of changing the term of expiration domain's registration. The
@ -10,23 +10,28 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
exp=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN EXP'
validate_format 'user' 'domain' 'exp'
is_format_valid 'user' 'domain' 'exp'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -57,7 +62,7 @@ fi
#----------------------------------------------------------#
# Logging
log_history "changed whois expiriation date for $domain"
log_event "$OK" "$EVENT"
log_history "changed whois expiration date for $domain"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,10 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
ip=$3
restart=$4
@ -21,13 +21,18 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN IP'
validate_format 'user' 'domain' 'ip'
is_format_valid 'user' 'domain' 'ip'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -51,6 +56,7 @@ sed -i "s/$old/$ip/g" $USER_DATA/dns/$domain.conf
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -59,7 +65,7 @@ if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain domain"
cmd="$BIN/v-add-remote-dns-domain $user $domain domain yes"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
fi
fi
@ -69,16 +75,12 @@ fi
# Vesta #
#----------------------------------------------------------#
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting named
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns ip for $domain to $ip"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -10,10 +10,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
restart=$4
@ -22,13 +22,18 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN SOA'
validate_format 'user' 'domain' 'soa'
is_format_valid 'user' 'domain' 'soa'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -45,6 +50,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$SOA' "$soa"
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -63,16 +69,12 @@ fi
# Vesta #
#----------------------------------------------------------#
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting named
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed soa record for $domain to $soa"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -11,10 +11,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
template=$3
restart=$4
@ -23,19 +23,23 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN TEMPLATE [RESTART]'
validate_format 'user' 'domain' 'template'
is_format_valid 'user' 'domain' 'template'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'dns' 'DOMAIN' "$domain"
is_object_unsuspended 'dns' 'DOMAIN' "$domain"
is_dns_template_valid
is_dns_template_valid "$template"
#----------------------------------------------------------#
@ -43,8 +47,7 @@ is_dns_template_valid
#----------------------------------------------------------#
# Defining variables
ip=$(get_object_value 'dns' 'DOMAIN' "$domain" '$IP')
get_domain_values 'dns'
i=1
ns=$(get_user_value '$NS')
for nameserver in ${ns//,/ };do
@ -52,21 +55,49 @@ for nameserver in ${ns//,/ };do
(( ++i))
done
# Reading template
template_data=$(cat $DNSTPL/$template.tpl)
# Deleting unused nameservers
if [ -z "$ns3" ]; then
template_data=$(echo "$template_data" |grep -v %ns3%)
fi
if [ -z "$ns4" ]; then
template_data=$(echo "$template_data" |grep -v %ns4%)
fi
if [ -z "$ns5" ]; then
template_data=$(echo "$template_data" |grep -v %ns5%)
fi
if [ -z "$ns6" ]; then
template_data=$(echo "$template_data" |grep -v %ns6%)
fi
if [ -z "$ns7" ]; then
template_data=$(echo "$template_data" |grep -v %ns7%)
fi
if [ -z "$ns8" ]; then
template_data=$(echo "$template_data" |grep -v %ns8%)
fi
# Changing tpl
cat $DNSTPL/$template.tpl |\
sed -e "s/%ip%/$ip/g" \
echo "$template_data" |\
sed -e "s/%ip%/$IP/g" \
-e "s/%domain_idn%/$domain_idn/g" \
-e "s/%domain%/$domain/g" \
-e "s/%ns1%/$ns1/g" \
-e "s/%ns2%/$ns2/g" \
-e "s/%ns3%/$ns3/g" \
-e "s/%ns4%/$ns4/g" \
-e "s/%ns5%/$ns5/g" \
-e "s/%ns6%/$ns6/g" \
-e "s/%ns7%/$ns7/g" \
-e "s/%ns8%/$ns8/g" \
-e "s/%time%/$TIME/g" \
-e "s/%date%/$DATE/g" > $USER_DATA/dns/$domain.conf
records="$(wc -l $USER_DATA/dns/$domain.conf |cut -f 1 -d ' ')"
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -89,16 +120,12 @@ fi
update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting named
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns template for $domain to $template" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -2,17 +2,17 @@
# info: change dns domain ttl
# options: USER DOMAIN TTL
#
# The function for chaning the time to live TTL parameter for all records.
# The function for changing the time to live TTL parameter for all records.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
ttl=$3
restart=$4
@ -21,13 +21,18 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN TTL'
validate_format 'user' 'domain' 'ttl'
is_format_valid 'user' 'domain' 'ttl'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -44,6 +49,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$TTL' "$ttl"
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -62,16 +68,12 @@ fi
# Vesta #
#----------------------------------------------------------#
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting named
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed TTL for $domain to $ttl"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
id=$3
dvalue=$(idn -t --quiet -u "$4" )
priority=$5
@ -24,13 +23,18 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ID VALUE [PRIORITY] [RESTART]'
validate_format 'user' 'domain' 'id' 'dvalue'
is_format_valid 'user' 'domain' 'id' 'dvalue'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -67,9 +71,14 @@ is_dns_nameserver_valid "$domain" "$TYPE" "$dvalue"
# Deleting old record
sed -i "/^ID='$id'/d" $USER_DATA/dns/$domain.conf
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding record
dns_rec="ID='$id' RECORD='$RECORD' TYPE='$TYPE' PRIORITY='$priority'"
dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date'"
echo "$dns_rec" >> $USER_DATA/dns/$domain.conf
# Sorting records
@ -77,6 +86,7 @@ sort_dns_records
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -95,16 +105,12 @@ fi
# Vesta #
#----------------------------------------------------------#
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting named
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns record on $domain to $dvalue"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
id=$3
newid=$4
restart=$5
@ -23,13 +22,18 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ID NEWID [RESTART]'
validate_format 'user' 'domain' 'id' 'newid'
is_format_valid 'user' 'domain' 'id' 'newid'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -51,6 +55,7 @@ sort_dns_records
# Updating zone
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
update_domain_serial
update_domain_zone
fi
@ -69,16 +74,12 @@ fi
# Vesta #
#----------------------------------------------------------#
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v-restart-dns
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Restarting named
$BIN/v-restart-dns $restart
check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns record id on $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,6 +1,6 @@
#!/bin/bash
# info: change ip owner
# options: DOMAIN USER [IP]
# info: change domain owner
# options: DOMAIN USER
#
# The function of changing domain ownership.
@ -9,10 +9,9 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
domain=$1
user=$2
ip=$3
# Includes
source $VESTA/func/ip.sh
@ -24,20 +23,13 @@ source $VESTA/conf/vesta.conf
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'DOMAIN USER [IP]'
validate_format 'domain' 'user'
check_args '2' "$#" 'DOMAIN USER'
is_format_valid 'domain' 'user'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
if [ ! -z "$ip" ]; then
is_ip_valid
is_ip_avalable
fi
owner=$(v-search-domain-owner $domain)
owner=$($BIN/v-search-domain-owner $domain)
if [ -z "$owner" ]; then
echo "Error: domain $domain doesn't exist"
log_event "$E_NOTEXIST" "$EVENT"
exit $E_NOTEXIST
check_result $E_NOTEXIST "domain $domain doesn't exist"
fi
if [ "$owner" = "$user" ]; then
exit
@ -156,6 +148,18 @@ if [ ! -z "$mail_data" ]; then
$BIN/v-unsuspend-mail-domain $user $domain no >> /dev/null 2>&1
$BIN/v-rebuild-mail-domains $owner no
$BIN/v-rebuild-mail-domains $user
# Checking exim username for later chowning
exim_user="exim";
check_exim_username=$(grep -c '^Debian-exim:' /etc/passwd)
if [ "$check_exim_username" -eq 1 ]; then
exim_user="Debian-exim"
fi
# Chowning mail conf files to exim user
if [ -d "$HOMEDIR/$user/conf/mail/$domain" ]; then
find $HOMEDIR/$user/conf/mail/$domain -user root \
-exec chown $exim_user {} \;
fi
fi
# Update counters
@ -168,6 +172,6 @@ $BIN/v-update-user-counters $user
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -13,7 +13,7 @@
# Importing system variables
source /etc/profile
# Argument defenition
# Argument definition
rule=$1
action=$(echo $2|tr '[:lower:]' '[:upper:]')
ip=$3
@ -40,9 +40,9 @@ sort_fw_rules() {
#----------------------------------------------------------#
check_args '5' "$#" 'RULE ACTION IP PORT [PROTOCOL] [COMMENT]'
validate_format 'rule' 'action' 'protocol' 'port_ext' 'ip'
is_format_valid 'rule' 'action' 'protocol' 'port_ext' 'ip'
if [ ! -z "$comment" ]; then
validate_format 'comment'
is_format_valid 'comment'
fi
is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
is_object_valid '../../data/firewall/rules' 'RULE' "$rule"
@ -52,10 +52,15 @@ is_object_valid '../../data/firewall/rules' 'RULE' "$rule"
# Action #
#----------------------------------------------------------#
# Generating timestamp
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Concatenating firewall rule
str="RULE='$rule' ACTION='$action' PROTOCOL='$protocol' PORT='$port_ext'"
str="$str IP='$ip' COMMENT='$comment' SUSPENDED='no'"
str="$str TIME='$TIME' DATE='$DATE'"
str="$str TIME='$time' DATE='$date'"
# Deleting old rule
sed -i "/RULE='$rule' /d" $VESTA/data/firewall/rules.conf
@ -75,6 +80,6 @@ $BIN/v-update-firewall
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

51
bin/v-change-fs-file-permission Executable file
View file

@ -0,0 +1,51 @@
#!/bin/bash
# info: change file permission
# options: USER FILE PERMISSIONS
#
# The function changes file access permissions on the file system
user=$1
src_file=$2
permissions=$3
# Checking arguments
if [ -z "$permissions" ]; then
echo "Usage: USER FILE PERMISSIONS"
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
exit 3
fi
# Checking user homedir
homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
if [ -z $homedir ]; then
echo "Error: user home directory doesn't exist"
exit 12
fi
# Checking source file
if [ ! -fe "$src_file" ]; then
echo "Error: source file doesn't exist $src_file"
exit 3
fi
# Checking source path
rpath=$(readlink -f "$src_file")
if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
echo "Error: invalid source path $src_file"
exit 2
fi
# Changing file permissions
sudo -u $user chmod -R $permissions "$src_file" >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Error: access permission on $src_file was not changed"
exit 3
fi
# Exiting
exit

View file

@ -9,22 +9,22 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
account=$3
password=$4
password=$4; HIDE=4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Hiding password
A4='******'
EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
@ -32,7 +32,7 @@ EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD'
validate_format 'user' 'domain' 'account' 'password'
is_format_valid 'user' 'domain' 'account'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -40,21 +40,23 @@ is_object_valid 'mail' 'DOMAIN' "$domain"
is_object_unsuspended 'mail' 'DOMAIN' "$domain"
is_object_valid "mail/$domain" 'ACCOUNT' "$account"
is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
is_password_valid
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
if [ -x '/usr/bin/doveadm' ]; then
md5=$(/usr/bin/doveadm pw -s md5 -p "$password")
else
md5=$(/usr/sbin/dovecotpw -s md5 -p "$password")
fi
# Generating hashed password
salt=$(generate_password "$PW_MATRIX" "8")
md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
quota=$(grep $account $VESTA/data/users/${user}/mail/${domain}.conf)
quota=$(echo $quota | awk '{ print $7 }' | sed -e "s/'//g" )
quota=$(echo $quota | cut -d "=" -f 2 | sed -e "s/unlimited/0/g")
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
str="$account:$md5:$user:mail::$HOMEDIR/$user:${quota}M"
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
fi
@ -68,6 +70,6 @@ update_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5' "$md5"
# Logging
log_history "changed password for $account@$domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,11 +9,10 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
domain=$2
domain_idn=$2
account=$3
quota=$4
@ -22,13 +21,21 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '4' "$#" 'USER DOMAIN ACCOUNT QUOTA'
validate_format 'user' 'domain' 'account' 'quota'
is_format_valid 'user' 'domain' 'account'
if [ "$quota" != 'unlimited' ]; then
is_format_valid 'quota'
fi
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -44,6 +51,9 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5')
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
if [ "$quota" = 'unlimited' ]; then
quota=0
fi
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
@ -54,11 +64,15 @@ fi
# Vesta #
#----------------------------------------------------------#
if [[ "$quota" -eq 0 ]]; then
quota='unlimited'
fi
# Update quota
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA' "$quota"
# Logging
log_history "changed mail quota for $account@$domain to $quota"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -2,32 +2,35 @@
# info: change mail domain catchall email
# options: USER DOMAIN EMAIL
#
# The function changes mail domain cathcall.
# The function changes mail domain catchall.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
domain_idn=$(idn -t --quiet -a "$domain")
email="$3"
domain=$2
domain_idn=$2
email=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
# Additional argument formatting
format_domain
format_domain_idn
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '3' "$#" 'USER DOMAIN EMAIL'
validate_format 'user' 'domain' 'email'
is_format_valid 'user' 'domain' 'email'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -41,8 +44,8 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
# Change cathcall alias
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "*@$domain_idn:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
fi
@ -53,9 +56,8 @@ fi
# Change catchall in config
update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
# Logging
log_history "changed catchall email for $domain to $email"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,5 +1,5 @@
#!/bin/bash
# info: change remote dns domain expiriation date
# info: change remote dns domain expiration date
# options: USER DOMAIN
#
# The function synchronize dns domain with the remote server.
@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$2
@ -24,83 +24,41 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
is_object_valid 'user' 'USER' "$user"
is_object_valid 'dns' 'DOMAIN' "$domain"
if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
echo "Error: dns-cluster.conf doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l)
if [ "$number_of_proc" -gt 2 ]; then
echo "Error: another sync process already exists"
log_event "$E_EXISTS $EVENT"
exit $E_EXISTS
fi
is_procces_running
remote_dns_health_check
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
old_ifs="$IFS"
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Check remote dns nodes
remote_dns_health_check
# Parsing remote host parameters
eval $cluster
for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Get host values
eval $cluster_str
# Check connection type
if [ -z "TYPE" ]; then
TYPE='api'
fi
# Switch on connection type
case $TYPE in
ssh) send_cmd="send_ssh_cmd" ;;
*) send_cmd="send_api_cmd" ;;
esac
# Check recipient dns user
if [ -z "$DNS_USER" ]; then
DNS_USER='dns-cluster'
fi
# Check dns exceptions
if [ -z "$DNS_CLUSTER_IGNORE" ]; then
DNS_CLUSTER_IGNORE='dns-cluster'
fi
# Sync domain
# Syncing domain
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
eval $str
$send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'scheduled'
if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed"
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no'
check_result $? "$HOST connection failed (exp insert)" $E_CONNECT
done
# Update pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$2
@ -24,86 +24,45 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
is_object_valid 'user' 'USER' "$user"
is_object_valid 'dns' 'DOMAIN' "$domain"
if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
echo "Error: dns-cluster.conf doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l)
if [ "$number_of_proc" -gt 2 ]; then
echo "Error: another sync process already exists"
log_event "$E_EXISTS $EVENT"
exit $E_EXISTS
fi
is_procces_running
remote_dns_health_check
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
old_ifs="$IFS"
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Check remote dns nodes
remote_dns_health_check
# Parsing remote host parameters
eval $cluster
for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Get host values
eval $cluster_str
# Check connection type
if [ -z "TYPE" ]; then
TYPE='api'
fi
# Switch on connection type
case $TYPE in
ssh) send_cmd="send_ssh_cmd" ;;
*) send_cmd="send_api_cmd" ;;
esac
# Check recipient dns user
if [ -z "$DNS_USER" ]; then
DNS_USER='dns-cluster'
fi
# Check dns exceptions
if [ -z "$DNS_CLUSTER_IGNORE" ]; then
DNS_CLUSTER_IGNORE='dns-cluster'
fi
# Sync domain
# Syncing SOA
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
eval $str
$send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no'
cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no'
check_result $? "$HOST connection failed (sync)" $E_CONNECT
# Rebuild dns zone
$send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed (rebuild)"
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
# Rebuilding dns zone
cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no'
check_result $? "$HOST connection failed (rebuild)" $E_CONNECT
done
# Update pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
domain=$2
@ -24,100 +24,45 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
is_object_valid 'user' 'USER' "$user"
is_object_valid 'dns' 'DOMAIN' "$domain"
if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
echo "Error: dns-cluster.conf doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l)
if [ "$number_of_proc" -gt 2 ]; then
echo "Error: another sync process already exists"
log_event "$E_EXISTS $EVENT"
exit $E_EXISTS
fi
is_procces_running
remote_dns_health_check
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
old_ifs="$IFS"
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Check remote dns nodes
remote_dns_health_check
# Parsing remote host parameters
eval $cluster
# Starting cluster loop
for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Get host values
eval $cluster_str
# Check connection type
if [ -z "TYPE" ]; then
TYPE='api'
fi
# Switch on connection type
case $TYPE in
ssh) send_cmd="send_ssh_cmd" ;;
*) send_cmd="send_api_cmd" ;;
esac
# Check host connection
$send_cmd v-list-sys-config
if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed"
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
# Check recipient dns user
if [ -z "$DNS_USER" ]; then
DNS_USER='dns-cluster'
fi
$send_cmd v-list-user $DNS_USER
if [ $? -ne 0 ]; then
echo "Error: dns user $DNS_USER doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
# Check dns exceptions
if [ -z "$DNS_CLUSTER_IGNORE" ]; then
DNS_CLUSTER_IGNORE='dns-cluster'
fi
# Sync domain
# Syncing TTL
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
eval $str
$send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no'
cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no'
check_result $? "$HOST connection failed (sync)" $E_CONNECT
# Rebuild dns zone
$send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled'
if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed (rebuild)"
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
# Rebuilding dns zone
cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no'
check_result $? "$HOST connection failed (rebuild)" $E_CONNECT
done
# Update pipe
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
exit

View file

@ -10,7 +10,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
key=$(echo "$1" | tr '[:lower:]' '[:upper:]' )
value=$2
@ -18,27 +18,34 @@ value=$2
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin"
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'KEY VALUE'
validate_format 'key'
check_ckey=$(grep "^$key='" $VESTA/conf/vesta.conf)
if [ -z "$check_ckey" ]; then
echo "Error: key $key not found"
log_event "$E_INVALID" "$EVENT"
exit $E_INVALID
fi
is_format_valid 'key'
format_no_quotes "$value" 'value'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Updating conf
sed -i "s/$key=.*/$key='$value'/g" $VESTA/conf/vesta.conf
check_ckey=$(grep "^$key='" $VESTA/conf/vesta.conf)
if [ -z "$check_ckey" ]; then
echo "$key='$value'" >> $VESTA/conf/vesta.conf
else
sed -i "s|$key=.*|$key='$value'|g" $VESTA/conf/vesta.conf
fi
if [ "$key" = "BACKUP" ] && [ "$value" != '/backup' ]; then
rm /backup
ln -s $value /backup
fi
#----------------------------------------------------------#
@ -46,6 +53,6 @@ sed -i "s/$key=.*/$key='$value'/g" $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
domain=$1
# Includes
@ -22,7 +22,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '1' "$#" 'HOSTNAME'
validate_format 'domain'
is_format_valid 'domain'
#----------------------------------------------------------#
@ -31,18 +31,16 @@ validate_format 'domain'
hostname $domain
# RHEL/CentOS
if [ -e "/etc/redhat-release" ]; then
if [ -d "/etc/sysconfig" ]; then
# RHEL/CentOS/Amazon
touch /etc/sysconfig/network
if [ -z "$(grep HOSTNAME /etc/sysconfig/network)" ]; then
echo "HOSTNAME='$domain'" >> /etc/sysconfig/network
else
sed -i "s/HOSTNAME=.*/HOSTNAME='$domain'/" /etc/sysconfig/network
fi
fi
# Debian/Ubuntu
if [ ! -e "/etc/redhat-release" ]; then
else
# Debian/Ubuntu
echo "$domain" > /etc/hostname
fi
@ -52,6 +50,6 @@ fi
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
ip=$1
ip_name=$2
@ -24,11 +24,9 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'IP IP_NAME'
validate_format 'ip'
if [ ! -z "$ip_name" ]; then
validate_format 'ip_name'
fi
is_ip_valid
is_format_valid 'ip'
is_format_valid 'ip_name'
is_ip_valid "$ip"
#----------------------------------------------------------#
@ -44,7 +42,7 @@ update_ip_value '$NAME' "$ip_name"
#----------------------------------------------------------#
# Logging
log_history "changed associated dns on $ip to $domain" '' 'admin'
log_event "$OK" "$EVENT"
log_history "changed associated dns on $ip to $ip_name" '' 'admin'
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
ip=$1
nat_ip=$2
restart=$3
@ -25,65 +25,83 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'IP NAT_IP [RESTART]'
validate_format 'ip'
if [ ! -z "$nat_ip" ]; then
validate_format 'nat_ip'
fi
is_ip_valid
is_format_valid 'ip'
is_format_valid 'nat_ip'
is_ip_valid "$ip"
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Changing nat ip
# Updating IP
if [ -z "$(grep NAT= $VESTA/data/ips/$ip)" ]; then
sed -i "s/^TIME/NAT='$nat_ip'\nTIME/g" $VESTA/data/ips/$ip
old=''
new=$nat_ip
else
update_ip_value '$NAT' "$nat_ip"
fi
# Check ftp system
if [ "$FTP_SYSTEM" = 'vsftpd' ]; then
# Find configuration
if [ -e '/etc/vsftpd/vsftpd.conf' ]; then
conf='/etc/vsftpd/vsftpd.conf'
fi
if [ -e '/etc/vsftpd.conf' ]; then
conf='/etc/vsftpd.conf'
fi
# Update config
if [ -z "$(grep pasv_address $conf)" ]; then
if [ ! -z "$nat_ip" ]; then
echo "pasv_address=$nat_ip" >> $conf
fi
else
if [ ! -z "$nat_ip" ]; then
sed -i "s/pasv_address=.*/pasv_address='$nat_ip'/g" $conf
else
sed -i "/pasv_address/d" $conf
fi
old=$(get_ip_value '$NAT')
new=$nat_ip
sed -i "s/NAT=.*/NAT='$new'/" $VESTA/data/ips/$ip
if [ -z "$nat_ip" ]; then
new=$ip
fi
fi
# Updating WEB configs
if [ ! -z "$old" ] && [ ! -z "$WEB_SYSTEM" ]; then
sed -i "s/$old/$new/" $VESTA/data/users/*/web.conf
for user in $(ls $VESTA/data/users/); do
$BIN/v-rebuild-web-domains $user no
done
$BIN/v-restart-dns $restart
fi
# Updating DNS configs
if [ ! -z "$old" ] && [ ! -z "$DNS_SYSTEM" ]; then
sed -i "s/$old/$new/" $VESTA/data/users/*/dns.conf
sed -i "s/$old/$new/" $VESTA/data/users/*/dns/*.conf
for user in $(ls $VESTA/data/users/); do
$BIN/v-rebuild-dns-domains $user no
done
$BIN/v-restart-dns $restart
fi
# Updating FTP
if [ ! -z "$old" ] && [ ! -z "$FTP_SYSTEM" ]; then
conf=$(find /etc -name $FTP_SYSTEM.conf)
if [ -e "$conf" ]; then
sed -i "s/$old/$new/g" $conf
if [ "$FTP_SYSTEM" = 'vsftpd' ]; then
check_pasv=$(grep pasv_address $conf)
if [ -z "$check_pasv" ] && [ ! -z "$nat_ip" ]; then
echo "pasv_address=$nat_ip" >> $conf
fi
if [ ! -z "$check_pasv" ] && [ -z "$nat_ip" ]; then
sed -i "/pasv_address/d" $conf
fi
if [ ! -z "$check_pasv" ] && [ ! -z "$nat_ip" ]; then
sed -i "s/pasv_address=.*/pasv_address='$nat_ip'/g" $conf
fi
fi
fi
$BIN/v-restart-ftp $restart
fi
# Updating firewall
if [ ! -z "$old" ] && [ ! -z "$FIREWALL_SYSTEM" ]; then
sed -i "s/$old/$new/g" $VESTA/data/firewall/*.conf
$BIN/v-update-firewall
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Restart ftp server
if [ "$restart" != 'no' ]; then
$BIN/v-restart-ftp
if [ $? -ne 0 ]; then
exit $E_RESTART
fi
fi
# Logging
log_history "changed associated nat address on $ip to $nat_ip" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
ip=$1
user=$2
@ -24,14 +24,13 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'IP USER'
validate_format 'ip' 'user'
is_format_valid 'ip' 'user'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_ip_valid
is_ip_valid "$ip"
is_ip_key_empty '$U_WEB_DOMAINS'
is_ip_key_empty '$U_SYS_USERS'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
@ -77,6 +76,6 @@ fi
# Logging
log_history "changed owner of $ip to $user" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
ip=$1
ip_status=$2
@ -24,21 +24,16 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'IP IP_STATUS'
validate_format 'ip' 'ip_status'
is_ip_valid
is_format_valid 'ip' 'ip_status'
is_ip_valid "$ip"
if [ "$ip_status" = "$(get_ip_value '$STATUS')" ]; then
echo "Error: status $ip_status is already set"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
check_result "$E_EXISTS" "status $ip_status is already set"
fi
web_domains=$(get_ip_value '$U_WEB_DOMAINS')
sys_user=$(get_ip_value '$U_SYS_USERS')
ip_owner=$(get_ip_value '$OWNER')
if [ "$web_domains" -ne '0' ] && [ "$sys_user" != "$ip_owner" ]; then
echo "Error: ip $ip is used"
log_event "$E_INUSE" "$EVENT"
exit $E_INUSE
check_result "$E_INUSE" "ip $ip is used"
fi
@ -56,6 +51,6 @@ update_ip_value '$STATUS' "$ip_status"
# Logging
log_history "changed $ip status to $ip_status" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
language=$1
# Includes
@ -20,7 +20,7 @@ source $VESTA/conf/vesta.conf
is_language_valid() {
if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then
echo "Error: language file $language doesn't exist"
log_event "$E_NOTEXIST $EVENT"
log_event "$E_NOTEXIST $ARGUMENTS"
exit $E_NOTEXIST
fi
}
@ -31,7 +31,7 @@ is_language_valid() {
#----------------------------------------------------------#
check_args '1' "$#" 'LANGUAGE'
validate_format 'language'
is_format_valid 'language'
is_language_valid $language
@ -52,6 +52,6 @@ fi
#----------------------------------------------------------#
# Logging
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

131
bin/v-change-sys-service-config Executable file
View file

@ -0,0 +1,131 @@
#!/bin/bash
# info: change service config
# options: CONFIG SERVICE [RESTART]
#
# The function for changing service confguration.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
src=$1
service=$2
restart=$3
echo "$0 $*" >/tmp/t.log
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'CONFIG SERVICE [RESTART]'
if [ ! -e "$src" ]; then
check_result "$E_NOTEXIST" "$src config doesn't exist"
fi
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining dst config path
case $service in
nginx) dst='/etc/nginx/nginx.conf';;
httpd) dst='/etc/httpd/conf/httpd.conf';;
apache2) dst='/etc/apache2/apache2.conf';;
exim) dst='/etc/exim/exim.conf';;
exim4) dst='/etc/exim4/exim4.conf.template';;
vsftpd) dst=$(find /etc/vsftpd* -name 'vsftpd.conf');;
proftpd) dst=$(find /etc/proftpd* -name 'proftpd.conf');;
php) dst=$(find /etc/php* -name php.ini);;
mysql) dst=$(find /etc/my* -name my.cnf);;
mysqld) dst=$(find /etc/my* -name my.cnf);;
mariadb) dst=$(find /etc/my* -name my.cnf);;
postgresql) dst=$($BIN/v-list-sys-pgsql-config plain |cut -f 1);;
postgresql-hba) dst=$($BIN/v-list-sys-pgsql-config plain |cut -f 2);;
dovecot) dst=$(find /etc/dovecot* -name dovecot.conf);;
dovecot-1) dst='/etc/dovecot/conf.d/10-auth.conf';;
dovecot-2) dst='/etc/dovecot/conf.d/10-logging.conf';;
dovecot-3) dst='/etc/dovecot/conf.d/10-mail.conf';;
dovecot-4) dst='/etc/dovecot/conf.d/10-master.conf';;
dovecot-5) dst='/etc/dovecot/conf.d/10-ssl.conf';;
dovecot-6) dst='/etc/dovecot/conf.d/20-imap.conf';;
dovecot-7) dst='/etc/dovecot/conf.d/20-pop3.conf';;
dovecot-8) dst='/etc/dovecot/conf.d/auth-passwdfile.conf.ext';;
named) dst='/etc/named.conf';;
bind9) dst='/etc/bind/named.conf';;
bind9-opt) dst='/etc/bind/named.conf.options';;
spamd) dst=$($BIN/v-list-sys-spamd-config plain);;
spamassassin) dst=$($BIN/v-list-sys-spamd-config plain);;
clamd) dst=$($BIN/v-list-sys-clamd-config plain);;
clamd.scan) dst=$($BIN/v-list-sys-clamd-config plain);;
cron) dst='/etc/crontab';;
crond) dst='/etc/crontab';;
fail2ban) dst='/etc/fail2ban/jail.local';;
*) check_result $E_NOTEXIST "service $service doesn't exist"
esac
# Checking config path
for config in $dst; do
if [ ! -e "$config" ]; then
check_result $E_NOTEXIST "$service config doesn't exist"
fi
done
# Checking diff between src and dst configs
for config in $dst; do
diff -q $src $config >/dev/null
if [ $? -ne 0 ]; then
cp $config $config.vst.back
cp $src $config
update="yes"
fi
done
# Restarting service
if [ "$update" = 'yes' ] && [ "$restart" != 'no' ]; then
if [[ "$service" =~ - ]]; then
service=$(echo ${service%-*})
fi
if [ "$service" = 'php' ]; then
if [ "$WEB_SYSTEM" = "nginx" ]; then
if [ $(ps --no-headers -o comm 1) == systemd ]; then
service=$(systemctl | grep -o -E "php.*fpm.*\.service")
service=${service//.service/}
else
service=$(ls /etc/init.d/php*fpm* |cut -f 4 -d /)
fi
else
service=$WEB_SYSTEM
fi
fi
for single_service in $service; do
service $single_service restart >/dev/null 2>&1
done <<< "$service"
if [ $? -ne 0 ]; then
for config in $dst; do
cat $config.vst.back > $config
rm -f $config.vst.back
done
check_result $E_RESTART "$service failed to start with new config"
fi
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

72
bin/v-change-sys-timezone Executable file
View file

@ -0,0 +1,72 @@
#!/bin/bash
# info: change system timezone
# options: TIMEZONE
#
# The function for changing system timezone.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
timezone=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
is_timezone_valid() {
if [ ! -e "/usr/share/zoneinfo/$timezone" ]; then
echo "Error: tz file $timezone doesn't exist"
log_event $E_NOTEXIST "$ARGUMENTS"
exit $E_NOTEXIST
fi
}
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '1' "$#" 'TIMEZONE'
is_timezone_valid
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Changing system timezone
which timedatectls >/dev/null 2>&1
if [ "$?" -eq 0 ]; then
timedatectl set-timezone $timezone
else
if [ -e "/etc/sysconfig/clock" ]; then
sed -i "s/ZONE.*//" /etc/sysconfig/clock
echo "ZONE=\"$timezone\"" >> /etc/sysconfig/clock
fi
if [ -e "/etc/timezone" ]; then
echo "$timezone" > /etc/timezone
fi
rm -f /etc/localtime
ln -sf /usr/share/zoneinfo/$timezone /etc/localtime
fi
# Chaning php timezone
if [ ! -z "$WEB_SYSTEM" ]; then
for conf in $(find /etc/php* -name php.ini); do
sed -i "s|;date.timezone =|date.timezone =|" $conf
sed -i "s|date.timezone =.*|date.timezone = $timezone|" $conf
done
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event "$OK" "$ARGUMENTS"
exit

77
bin/v-change-sys-vesta-ssl Executable file
View file

@ -0,0 +1,77 @@
#!/bin/bash
# info: change vesta ssl certificate
# options: SSL_DIR [RESTART]
#
# The function changes vesta SSL certificate and the key.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument definition
domain='certificate'
ssl_dir=$1
restart=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
check_args '1' "$#" 'SSL_DIR [RESTART]'
is_format_valid 'ssl_dir'
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Checking new certificate
certificate=$(cat $ssl_dir/$domain.crt |grep -n END)
certificate_count=$(echo "$certificate" |wc -l)
if [ "$certificate_count" -gt 1 ]; then
crt_end=$(echo "$certificate" |head -n1 |cut -f 1 -d :)
crt_lines=$(wc -l $ssl_dir/$domain.crt |cut -f1 -d ' ')
pem_begin=$((crt_lines - crt_end))
mv $ssl_dir/$domain.crt $ssl_dir/$domain.crt_full
head -n $crt_end $ssl_dir/$domain.crt_full > $ssl_dir/$domain.crt
tail -n $pem_begin $ssl_dir/$domain.crt_full > $ssl_dir/$domain.ca
is_web_domain_cert_valid
mv -f $ssl_dir/$domain.crt_full $ssl_dir/$domain.crt
rm -f $ssl_dir/$domain.ca
else
is_web_domain_cert_valid
fi
# Moving old certificate
mv $VESTA/ssl/certificate.crt $VESTA/ssl/certificate.crt.back
mv $VESTA/ssl/certificate.key $VESTA/ssl/certificate.key.back
# Adding new certificate
cp -f $ssl_dir/certificate.crt $VESTA/ssl/certificate.crt
cp -f $ssl_dir/certificate.key $VESTA/ssl/certificate.key
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Restarting web server
if [ "$restart" != 'no' ]; then
kill -HUP $(cat /var/run/vesta-nginx.pid)
$BIN/v-restart-mail
if [ ! -z "$IMAP_SYSTEM" ]; then
v-restart-service "$IMAP_SYSTEM"
fi
fi
# Logging
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
email=$2
@ -23,7 +23,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER EMAIL'
validate_format 'user' 'email'
is_format_valid 'user' 'email'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -49,6 +49,6 @@ $BIN/v-rebuild-cron-jobs $user > /dev/null 2>&1
# Logging
log_history "changed contact email to $email"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
language=$2
@ -19,9 +19,14 @@ source $VESTA/conf/vesta.conf
is_language_valid() {
if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then
echo "Error: language $language not exist"
log_event "$E_NOTEXIST $EVENT"
if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then
echo "Error: language $1 is not valid"
log_event "$E_INVALID" "$ARGUMENTS"
exit $E_INVALID
fi
if [ ! -e "$VESTA/web/inc/i18n/$1.php" ]; then
echo "Error: language $1 doesn't exist"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
fi
}
@ -32,7 +37,7 @@ is_language_valid() {
#----------------------------------------------------------#
check_args '2' "$#" 'USER LANGUAGE'
validate_format 'user' 'language'
is_format_valid 'user' 'language'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_language_valid $language
@ -56,6 +61,6 @@ fi
# Logging
log_history "changed language to $language"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,7 +9,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
fname=$2
lname=$3
@ -24,7 +24,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '3' "$#" 'USER FNAME LNAME'
validate_format 'user' 'fname' 'lname'
is_format_valid 'user' 'fname' 'lname'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -48,6 +48,6 @@ update_user_value "$user" '$LNAME' "$lname"
# Logging
log_history "changed user name to $fname $lname"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -1,20 +1,24 @@
#!/bin/bash
# info: change user nameservers
# options: USER NS1 NS2 [NS3] [NS4]
# options: USER NS1 NS2 [NS3] [NS4] [NS5] [NS6] [NS7] [NS8]
#
# The function for changing default nameservers for speciefic user.
# The function for changing default nameservers for specific user.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
ns1=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns2=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns3=$4
ns4=$5
ns3=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns4=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns5=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns6=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g')
# Includes
source $VESTA/func/main.sh
@ -26,19 +30,34 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
# Checking args
check_args '3' "$#" 'USER NS1 NS2 [NS3] [NS4]'
check_args '3' "$#" 'USER NS1 NS2 [NS3] [NS4] [NS5] [NS6] [NS7] [NS8]'
# Checking argument format
validate_format 'user' 'ns1' 'ns2'
is_format_valid 'user' 'ns1' 'ns2'
if [ ! -z "$ns3" ]; then
ns3=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g')
validate_format 'ns3'
is_format_valid 'ns3'
fi
if [ ! -z "$ns4" ]; then
ns4=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g')
validate_format 'ns4'
is_format_valid 'ns4'
fi
if [ ! -z "$ns5" ]; then
ns5=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns5'
fi
if [ ! -z "$ns6" ]; then
ns6=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns6'
fi
if [ ! -z "$ns7" ]; then
ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns7'
fi
if [ ! -z "$ns8" ]; then
ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns8'
fi
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -48,7 +67,7 @@ is_object_unsuspended 'user' 'USER' "$user"
#----------------------------------------------------------#
# Merging values
ns="$ns1,$ns2,$ns3,$ns4"
ns="$ns1,$ns2,$ns3,$ns4,$ns5,$ns6,$ns7,$ns8"
ns=$(echo "$ns" | sed -e "s/,,//g" -e "s/,$//")
# Changing ns values
@ -60,7 +79,7 @@ update_user_value "$user" '$NS' "$ns"
#----------------------------------------------------------#
# Logging
log_history "changed user nameservers to $ns1, $ns2"
log_event "$OK" "$EVENT"
log_history "updated nameservers $ns1 $ns2 $ns3 $ns4 $ns5 $ns6 $ns7 $ns8"
log_event "$OK" "$ARGUMENTS"
exit

View file

@ -9,23 +9,19 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
# Argument definition
user=$1
package=$2
force=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
is_package_avalable() {
# Parsing user data
usr_data=$(cat $USER_DATA/user.conf)
IFS=$'\n'
for key in $usr_data; do
eval ${key%%=*}=${key#*=}
done
source $USER_DATA/user.conf
WEB_DOMAINS='0'
DATABASES='0'
MAIL_DOMAINS='0'
@ -33,32 +29,66 @@ is_package_avalable() {
DISK_QUOTA='0'
BANDWIDTH='0'
pkg_data=$(cat $VESTA/data/packages/$package.pkg |grep -v TIME |\
grep -v DATE)
eval $pkg_data
pkg_data=$(cat $VESTA/data/packages/$package.pkg| egrep -v "TIME|DATE")
IFS=$'\n'
for str in $pkg_data; do
key=$(echo $str |cut -f 1 -d =)
value=$(echo $str |cut -f 2 -d \')
eval $key="$value"
done
# Comparing user data with package
if [[ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ]] ||\
[[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]] ||\
[[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ]] ||\
[[ "$DATABASES" -lt "$U_DATABASES" ]] ||\
[[ "$CRON_JOBS" -lt "$U_CRON_JOBS" ]] ||\
[[ "$DISK_QUOTA" -lt "$U_DISK" ]] ||\
[[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]]; then
echo "Error: Package not cover current usage"
log_event "$E_LIMIT" "$EVENT"
exit $E_LIMIT
# Checking usage agains package limits
if [ "$WEB_DOMAINS" != 'unlimited' ]; then
if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ]; then
check_result $E_LIMIT "Package doesn't cover WEB_DOMAIN usage"
fi
fi
if [ "$DNS_DOMAINS" != 'unlimited' ]; then
if [ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]; then
check_result $E_LIMIT "Package doesn't cover DNS_DOMAIN usage"
fi
fi
if [ "$MAIL_DOMAINS" != 'unlimited' ]; then
if [ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ]; then
check_result $E_LIMIT "Package doesn't cover MAIL_DOMAIN usage"
fi
fi
if [ "$DATABASES" != 'unlimited' ]; then
if [ "$DATABASES" -lt "$U_DATABASES" ]; then
check_result $E_LIMIT "Package doesn't cover DATABASE usage"
fi
fi
if [ "$CRON_JOBS" != 'unlimited' ]; then
if [ "$CRON_JOBS" -lt "$U_CRON_JOBS" ]; then
check_result $E_LIMIT "Package doesn't cover CRON usage"
fi
fi
if [ "$DISK_QUOTA" != 'unlimited' ]; then
if [ "$DISK_QUOTA" -lt "$U_DISK" ]; then
check_result $E_LIMIT "Package doesn't cover DISK usage"
fi
fi
if [ "$BANDWIDTH" != 'unlimited' ]; then
if [ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
check_result $E_LIMIT "Package doesn't cover BANDWIDTH usage"
fi
fi
# Checking templates
is_web_template_valid $WEB_TEMPLATE
is_dns_template_valid $DNS_TEMPLATE
is_proxy_template_valid $PROXY_TEMPLATE
}
change_user_package() {
usr_data=$(cat $USER_DATA/user.conf)
eval $usr_data
pkg_data=$(cat $VESTA/data/packages/$package.pkg |grep -v TIME |\
grep -v DATE)
eval $pkg_data
source $USER_DATA/user.conf
pkg_data=$(cat $VESTA/data/packages/$package.pkg| egrep -v "TIME|DATE")
IFS=$'\n'
for str in $pkg_data; do
key=$(echo $str |cut -f 1 -d =)
value=$(echo $str |cut -f 2 -d \')
eval $key="$value"
done
echo "FNAME='$FNAME'
LNAME='$LNAME'
PACKAGE='$package'
@ -110,6 +140,7 @@ U_DATABASES='$U_DATABASES'
U_CRON_JOBS='$U_CRON_JOBS'
U_BACKUPS='$U_BACKUPS'
LANGUAGE='$LANGUAGE'
NOTIFICATIONS='$NOTIFICATIONS'
TIME='$TIME'
DATE='$DATE'" > $USER_DATA/user.conf
}
@ -120,7 +151,7 @@ DATE='$DATE'" > $USER_DATA/user.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER PACKAGE [FORCE]'
validate_format 'user' 'package'
is_format_valid 'user' 'package'
is_object_valid 'user' 'USER' "$user"
is_package_valid
if [ "$force" != 'yes' ];then
@ -136,7 +167,7 @@ fi
change_user_package
# Update user shell
shell_conf=$(echo "$pkg_data" | grep 'SHELL' | cut -f 2 -d \')
shell_conf=$(echo "$pkg_data" |grep 'SHELL' |cut -f 2 -d \')
shell=$(grep -w "$shell_conf" /etc/shells |head -n1)
/usr/bin/chsh -s "$shell" "$user" &>/dev/null
@ -145,6 +176,12 @@ if [ -x "$VESTA/data/packages/$package.sh" ]; then
$VESTA/data/packages/$package.sh "$user" "$CONTACT" "$FNAME" "$LNAME"
fi
# Update disk quota
source $VESTA/conf/vesta.conf
if [ "$DISK_QUOTA" = 'yes' ]; then
$BIN/v-update-user-quota $user
fi
#----------------------------------------------------------#
# Vesta #
@ -152,6 +189,6 @@ fi
# Logging
log_history "changed $user package to $package" '' 'admin'
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit

Some files were not shown because too many files have changed in this diff Show more