Commit Graph

119 Commits

Author SHA1 Message Date
Martin
9ace1b1ae1 Add last modified time to each setting to resolve conflicts of which kind of setting should be used (from client or server) 2020-07-13 00:37:58 +02:00
Martin
d4770e7637 Set default server settings if not set 2020-02-12 15:19:35 +01:00
Martin
2d9fcb0022 Setting to only allow access to settings after the user enters a text 2020-01-19 22:56:09 +01:00
Martin
15a7e196d3 Add option to send mail SSL encrypted (without STARTTLS) 2020-01-13 23:51:54 +01:00
Martin
09551b6162 More explicit setting configuration 2019-11-01 13:57:43 +01:00
Martin
637aa98002 More explicit setting configuration 2019-10-31 12:05:27 +01:00
Martin
d0582908a5 More explicit setting configuration 2019-10-28 19:24:03 +01:00
Martin
539e51a85d More explicit settings configuration
(cherry picked from commit 8a2ee6cd3ddbf5d739fbfaf33ecb367930206471)

# Conflicts:
#	urbackupcommon/settingslist.cpp
#	urbackupserver/dllmain.cpp
#	urbackupserver/server_settings.cpp
#	urbackupserver/server_settings.h
#	urbackupserver/serverinterface/settings.cpp
2019-10-20 03:20:25 +02:00
Martin
6a152a2843 More explicit settings configuration
(cherry picked from commit 8a2ee6cd3ddbf5d739fbfaf33ecb367930206471)

# Conflicts:
#	urbackupcommon/settingslist.cpp
#	urbackupserver/dllmain.cpp
#	urbackupserver/server_settings.cpp
#	urbackupserver/server_settings.h
#	urbackupserver/serverinterface/settings.cpp
2019-10-15 20:23:18 +02:00
Martin
22c4b3e287 Make list of servers forwarding endpoint information configurable
(cherry picked from commit a3ac7c26fdebdadae8065577d0167fec351ac286)

# Conflicts:
#	urbackupcommon/settingslist.cpp
#	urbackupserver/serverinterface/settings.cpp
#	urbackupserver/www/js/urbackup.js
#	urbackupserver/www/templates/settings_inv_row.htm
2019-08-04 19:46:18 +02:00
Martin
881f731a2e Fixup backup folder location correctly
(cherry picked from commit 823fea02a0a168fd41b2cb292c8bef9f731e0a1d)
2019-06-02 21:23:43 +02:00
Martin
e943aa627e Revert "Revert "New setting to make backup dirs optional per default""
This reverts commit e4a1895e69.
2019-04-19 12:28:14 +02:00
Martin
fbd6965e7b Merge branch '2.3.x' into 2.4.x 2019-04-19 12:19:41 +02:00
Martin
e4a1895e69 Revert "New setting to make backup dirs optional per default"
This reverts commit b1fb7141e8.
2019-03-18 17:05:46 +01:00
Martin
c63aafeb9a Ability to connect via http connect proxy to internet server 2019-03-18 15:53:30 +01:00
Martin Raiber
b1fb7141e8 New setting to make backup dirs optional per default 2019-03-01 16:03:57 +01:00
Martin
20b6605a18 Update filesystem configuration after backupfolder is changed 2018-10-21 16:17:08 +02:00
Martin
fa07ea7419 Fix group id retrieval 2018-06-19 19:24:34 +02:00
Martin Raiber
b5c1239a05 Backup using reflinks if they are available 2018-04-01 23:20:36 +02:00
Martin
b864185361 Always use simple tokenize function 2017-11-01 14:14:00 +01:00
Martin
d34ff592ee Give alert script params a type 2017-04-20 12:49:57 +02:00
Martin
4408825065 Added alert script editor 2017-04-13 21:02:22 +02:00
Martin
2e396f5c8e Scipted alert system 2017-04-10 17:53:28 +02:00
Martin
85aca2de41 Allow restore via Internet 2017-03-02 00:36:06 +01:00
Martin
ecc94b9e6f Temporary setting to enable parallel file hashing 2017-03-02 00:11:59 +01:00
Martin
da2a179c30 Require user to specify which image volumes to archive when configuring image backup archiving 2017-01-13 18:03:20 +01:00
Martin
df6ba18d5a Ignore group setting for default group 2016-12-19 13:47:15 +01:00
Martin
6715bc638b Manual deletion of file and image backup from web interface 2016-12-16 20:32:59 +01:00
Martin
a3d46b721a Correctly show group archive settings 2016-12-14 17:06:29 +01:00
Martin
4a7563b135 Hostname database and settings to configure it to not start backups if clients have certain hostnames 2016-12-10 20:57:39 +01:00
Martin
0b2522cea2 Update client access key if not present 2016-11-30 09:24:39 +01:00
Martin
e572e4b6f7 Fix archiving in combination with groups 2016-10-12 20:36:34 +02:00
Martin
4312df4fe2 Image backups with zfs snapshots 2016-09-27 19:21:56 +02:00
Martin
16db3ab1e5 Start off with global settings as default when creating new group 2016-09-23 17:46:14 +02:00
Martin
fc139454e2 Image and file backup snapshot groups 2016-08-21 21:22:54 +02:00
Martin
3a5ec082d9 Settings groups for clients 2016-08-09 21:07:10 +02:00
Martin
d416f1006f Capabilities for allowing/disallowing file and component restores and config 2016-08-03 18:01:27 +02:00
Martin
0c5b8089b8 Fix vss component includes 2016-07-24 23:53:13 +02:00
Martin
00938f77f5 Option to ignore read and hash errors 2016-06-10 19:18:58 +02:00
Martin
cd9ad82526 Configure cbt via server side settings 2016-03-22 18:10:52 +01:00
Martin
9ee64e650a Updated copyright 2016-01-02 16:38:00 +01:00
Martin
f75eca1a4f Changed the web interface to use POST instead of GET 2015-12-20 21:41:18 +01:00
Martin
5fbb571411 REad file hashes from metadata + refactoring 2015-12-19 21:47:58 +01:00
Martin
350fda76c6 Fixed user view creation and added setting to web interface 2015-12-15 00:48:54 +01:00
Martin
54c68591c2 A few web interface improvements 2015-12-14 20:25:06 +01:00
Martin
9bab514e22 Removed UTF16 string (std::wstring) in most places. UTF8 everywhere! 2015-12-13 16:17:36 +01:00
Martin
e90cb501ae Multiple virtual clients per real client 2015-12-09 22:53:57 +01:00
Martin
6447563c2e Merge remote-tracking branch 'urpc/next' into dev
Conflicts:
	.gitignore
	Interface/Database.h
	configure.ac_client
	configure.ac_server
	fileservplugin/CClientThread.cpp
	fileservplugin/CClientThread.h
	fileservplugin/FileServFactory.cpp
	fileservplugin/FileServFactory.h
	fileservplugin/IFileServFactory.h
	fsimageplugin/FSImageFactory.cpp
	fsimageplugin/FSImageFactory.h
	fsimageplugin/FileWrapper.cpp
	fsimageplugin/FileWrapper.h
	fsimageplugin/IFSImageFactory.h
	fsimageplugin/Makefile.am_client
	fsimageplugin/Makefile.am_server
	fsimageplugin/dllmain.cpp
	fsimageplugin/filesystem.cpp
	fsimageplugin/filesystem.h
	fsimageplugin/fs/ntfs.cpp
	fsimageplugin/fs/ntfs.h
	fsimageplugin/fs/ntfs_win.cpp
	fsimageplugin/fs/ntfs_win.h
	fsimageplugin/fs/unknown.cpp
	fsimageplugin/fs/unknown.h
	fsimageplugin/fsimageplugin.vcxproj.filters
	start_urbackup_client
	start_urbackup_server
	urbackupclient/ChangeJournalWatcher.cpp
	urbackupclient/ClientService.cpp
	urbackupclient/ClientServiceCMD.cpp
	urbackupclient/ImageThread.cpp
	urbackupclient/client.cpp
	urbackupclient/client.h
	urbackupclient/client_restore.cpp
	urbackupclient/clientdao.cpp
	urbackupclient/dllmain.cpp
	urbackupclient/win_sysvol.cpp
	urbackupclient/win_sysvol.h
	urbackupcommon/fileclient/FileClient.cpp
	urbackupcommon/fileclient/FileClientChunked.cpp
	urbackupcommon/os_functions.h
	urbackupcommon/os_functions_lin.cpp
	urbackupcommon/os_functions_win.cpp
	urbackupcommon/settingslist.cpp
	urbackupserver/ImageBackup.cpp
	urbackupserver/SQLiteFileCache.cpp
	urbackupserver/ServerDownloadThread.cpp
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/dao/ServerBackupDao.h
	urbackupserver/dllmain.cpp
	urbackupserver/doc/admin_guide.tex
	urbackupserver/server_channel.cpp
	urbackupserver/server_channel.h
	urbackupserver/server_cleanup.cpp
	urbackupserver/server_dir_links.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_hash.cpp
	urbackupserver/server_hash.h
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/server_update_stats.cpp
	urbackupserver/server_writer.cpp
	urbackupserver/serverinterface/backups.cpp
	urbackupserver/serverinterface/settings.cpp
	urbackupserver/serverinterface/usage.cpp
	urbackupserver/www/js/urbackup.js
	urbackupserver/www/templates.js
	urbackupserver/www/templates/settings_inv_row.htm
	urbackupserver/www/translations/urbackup.webinterface/ar_SA.po
2015-12-09 14:49:13 +01:00
Martin
cdd9c0ae76 Merge branch 'dev' of server.raiber.de:~/urbackup_backend into dev
Conflicts:
	urbackupserver/dllmain.cpp
2015-12-04 21:45:04 +01:00
Martin
57e6febc0d Stronger user password hashing with PBKDF2-SHA256(10000) 2015-12-04 21:43:58 +01:00