Skip to content

Commit

Permalink
Merge to 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
louismunro committed Apr 15, 2015
2 parents 2f56e6c + d620445 commit 4dbbd94
Show file tree
Hide file tree
Showing 574 changed files with 40,563 additions and 10,104 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ db/pf-schema.sql
raddb/eap.conf
raddb/radiusd.conf
raddb/sql.conf
raddb/proxy.conf.inc
raddb/clients.conf.inc
conf/adminroles.conf
conf/authentication.conf
conf/floating_network_device.conf
Expand All @@ -37,6 +39,8 @@ conf/radiusd/eap.conf
conf/radiusd/radiusd.conf
conf/radiusd/sql.conf
conf/radiusd/proxy.conf.inc
conf/radiusd/clients.conf.inc
conf/radiusd/packetfence-cluster
conf/realm.conf
conf/snort/classification.config
conf/snort/local.rules
Expand All @@ -61,7 +65,12 @@ conf/vlan_filters.conf
html/captive-portal/captive_portal.conf
conf/pfdetect_remote.conf
conf/pfarp_remote.conf
conf/pfconfig.conf
conf/allowed-gaming-oui.txt
conf/cluster.conf
conf/domain.conf
conf/haproxy.conf
conf/keepalived.conf
conf/templates/emails-billing_confirmation.txt.tt
conf/templates/emails-guest_admin_pregistration.txt.tt
conf/templates/emails-guest_email_activation.txt.tt
Expand Down Expand Up @@ -93,6 +102,7 @@ html/admin/traplog/

# built by package or installer
lib/pf/pfcmd/pfcmd_pregrammar.pm
lib/fingerbank

# directories that can be ignored
logs/
Expand Down
Loading

0 comments on commit 4dbbd94

Please sign in to comment.