Commit Graph

119 Commits

Author SHA1 Message Date
Stefan Schantl
9673754385 backup: Include sshd config file.
The sshd config file was not included in the backups, so if the port
was switched from the default one to another one, the changed value was
correctly restored and displayed in the WUI but still the original sshd
config file was present and the default port has been used.

This issue is fixed by this commit.

Fixes #10446.
2015-04-13 15:35:15 +02:00
Arne Fitzenreiter
0fbba54e82 Merge branch 'master' into next
Conflicts:
	lfs/monit
2015-04-11 21:58:09 +02:00
Alexander Marx
6b7cbc8f33 vpn-statistic: move collectd.vpn to /var/ipfire/ovpn/
collectd.vpn needs to be within /var/ipfire/ovpn so that the
ovpnmain.cgi is able to write the status files from the n2n connections
to the file.
2015-04-09 15:16:32 +02:00
Michael Tremer
261121f1df Remove some left-over files 2015-03-18 15:18:56 +01:00
Arne Fitzenreiter
5604dc748d backup: make include file parsing more robust. 2015-03-06 17:22:18 +01:00
Michael Tremer
0f0e30dced haproxy: New package 2015-03-05 14:48:16 +01:00
Michael Tremer
3ed94afdc8 teamspeak: Remove package
This is an old version any way and just used to download the
pre-compiled data from the servers of the vendor.
2015-03-03 21:11:34 +01:00
Dirk Wagner
5ae99dd2d1 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit 2014-10-15 22:38:13 +02:00
Michael Tremer
cc7411e791 Merge remote-tracking branch 'morlix/bacula' into next
Conflicts:
	make.sh
2014-07-26 21:34:45 +02:00
Michael Tremer
32e799902d Merge remote-tracking branch 'morlix/check_mk' into next 2014-07-26 21:34:06 +02:00
Timo Eissler
38ace2f3ae check_mk_agent: fixed backup include filename 2014-07-25 20:32:00 +02:00
Michael Tremer
c5000130ec Merge branch 'check_mk' of https://github.com/morlix/ipfire-2.x into next 2014-07-23 20:57:22 +02:00
Timo Eissler
ce12ce8cd7 check_mk: add backup config file 2014-07-23 20:20:53 +02:00
Dirk Wagner
9ac9fc3d80 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
Conflicts:
	config/rootfiles/packages/asterisk
2014-07-23 10:37:02 +02:00
Dirk Wagner
57865e53f7 monit addon: fixed start script links. 2014-07-23 10:30:14 +02:00
Timo Eissler
6d3854a89c bacula: several fixes 2014-07-23 06:20:07 +02:00
Michael Tremer
35ef18de77 Add /etc/logrotate.d to backup. 2014-07-10 22:06:53 +02:00
Daniel Weismüller
14902296c1 owncloud: added the data-directory to the backup 2014-07-10 19:24:50 +02:00
Michael Tremer
83e8d92673 owncloud: Exclude data directory from backup. 2014-07-10 19:24:50 +02:00
root
7140a7a87b Packages: Added new package owncloud
Conflicts:

	make.sh
2014-07-10 19:24:46 +02:00
Michael Tremer
776029bbd3 icinga: Add new package. 2014-05-29 23:36:15 +02:00
Michael Tremer
abe7ef8936 Merge remote-tracking branch 'ms/stunnel-addon' 2014-04-30 15:02:51 +02:00
Michael Tremer
126507e5cf watchdog: Update addon. 2014-04-27 19:37:42 +02:00
Michael Tremer
d2d7a46b1e stunnel: New package. 2014-04-25 12:42:52 +02:00
Arne Fitzenreiter
2b4593b27f backup.pl: remove wrong curly bracket. 2014-02-04 16:01:43 +01:00
Michael Tremer
98f3d9b581 mysql: Fix updating the package.
The mysql server daemon will now be stopped before the update
is executed and all configuration and data files will be
backed up.
2014-01-26 19:29:37 +01:00
Michael Tremer
9063a04e94 Merge branch 'master' into fifteen
Conflicts:
	config/backup/backup.pl
2014-01-09 13:31:25 +01:00
Michael Tremer
59cbe38697 backup: Convert backups with old CCD files. 2014-01-09 12:31:31 +01:00
Alexander Marx
cbc6219852 Firewall: Fix typo in backup script which stops the conversion of old firewallrules 2013-11-08 13:41:25 +01:00
Alexander Marx
8039a71099 Firewall: renamed forwardfwctrl to firewallctrl 2013-10-24 09:42:42 +02:00
Alexander Marx
6d8eb5dec7 Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall 2013-10-24 09:24:12 +02:00
Alexander Marx
caca013c11 Forward Firewall: added /var/ipfire/forward/bin to backup-exclude script 2013-08-12 15:53:16 +02:00
Alexander Marx
6f348fcb9d Forward Firewall: edited include file of backup. 2013-08-09 14:13:07 +02:00
Alexander Marx
e09884e04f Forward Firewall: some fixes:
1) Counter was not correctly decreased when deleting a network from a customgroup
2) Convert-outgoingfw improved
3) Backup didn't set filepermissions correctly
2013-08-09 14:12:39 +02:00
Alexander Marx
f7e649ddfb Forward Firewall: some typos in dmz-converter 2013-08-09 14:12:39 +02:00
Alexander Marx
a60dbb4b6a Forward Firewall: added dmz-converter.
Also extended backup.pl script to support old backups. Now it is possible to restore old backups into new firewall. On restore, all config files of new firewall will be destroyed and the 4 converters will recreate them.
2013-08-09 14:12:37 +02:00
Alexander Marx
9edb1d7a8e Forward Firewall: edited Backup.pl. If someone put /var/ipfire/outgoing into /var/ipfire/backup/include, the rules are backed up and need to be restored.
Now the backup takes care of this and checks if there are old rules to convert.
2013-08-09 14:08:13 +02:00
Alexander Marx
99e698d033 Forward Firewall: Minor changes...
1) improved convert-outgoingfw. source was wrong when tun+ interface
2) target had always a ":" in ruletable
3) convert-outgoingfw bugfix: ports where not cleared for next rule
2013-08-09 14:08:12 +02:00
Alexander Marx
e0800c21db Forward Firewall: Edited Backup.pl so that any old backups get converted to new firewall. Afterwards the directories /var/ipfire/outgoing and /var/ipfire/xtaccess are removed! 2013-08-09 14:08:12 +02:00
Alexander Marx
b526909163 Forward Firewall: BUGFIX: MAC source addresses where not created as rules 2013-08-09 14:08:08 +02:00
Alexander Marx
92788c464b Forward Firewall: deleted /var/ipfire/outgoing from backup 2013-08-09 14:07:12 +02:00
Michael Tremer
111c99ddfa Forward Firewall: applied all changes as diff and added new files. Also deleted c files from xtaccess and setdmzholes.
Signed-off-by: Alexander Marx <amarx@ipfire.org>

Conflicts:
	config/backup/include
	lfs/configroot
	lfs/usb-stick
2013-08-09 14:02:02 +02:00
Michael Tremer
295649ff27 tor: Configuration file updates. 2013-07-30 21:39:50 +02:00
Michael Tremer
b312967ce3 tor: New package. 2013-07-29 21:29:34 +02:00
Michael Tremer
1892a329f6 vdr: Add /etc/sysconfig/vdr to backup. 2013-07-18 13:10:22 +02:00
Arne Fitzenreiter
9c55c65e05 dnsforward: add config to iso and updater. 2013-07-16 22:58:13 +02:00
Arne Fitzenreiter
3033567376 wireless-client: add wireless cfg to iso, backup and core71. 2013-07-06 19:49:59 +02:00
Arne Fitzenreiter
2e11506109 igmpproxy: add igmpproxy.conf backup include.
fixes #10375.
2013-07-03 10:31:53 +02:00
Michael Tremer
3142f133bb New package: keepalived 2013-06-14 13:37:59 +02:00
Michael Tremer
36566a23ba posfix: Update to 2.10.0. 2013-06-05 12:07:20 +02:00