webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Browse Source 
Conflicts:
	config/rootfiles/packages/asterisk
This commit is contained in:
Dirk Wagner
2014-07-23 10:37:02 +02:00
parent 57865e53f7 9d9c825b4e
commit 9ac9fc3d80
220 changed files with 13184 additions and 1948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/backup/include
View File

@@ -12,6 +12,7 @@
/etc/hosts*
/etc/httpd/*
/etc/ssh/ssh_host*
/etc/logrotate.d
/var/ipfire/auth/users
/var/ipfire/dhcp/*
/var/ipfire/dnsforward/*

2
config/backup/includes/owncloud Normal file
View File

@@ -0,0 +1,2 @@
/srv/web/owncloud/config
/var/owncloud/data