summaryrefslogtreecommitdiff
path: root/p11-kit/pkcs11.conf.example.in
Commit message (Collapse)AuthorAgeFilesLines
* Change the default of 'user-config' to merge.Stef Walter2012-09-061-2/+2
| | | | | | | * This allows user configured PKCS#11 modules by default. * Admins can change this to 'none' in /etc/pkcs11/pkcs11.conf to go back to the previous behavior. * Posted to the mailing list.
* Rename pkgconfig configuration directory variablesKalev Lember2011-09-141-1/+1
| | | | | | | | | | | | Renamed them to reduce ambiguity and to pave the way for exposing some additional parameters. p11_system_modules -> p11_system_config_modules p11_user_modules -> p11_user_config_modules configure --with-pkcs11-dir => configure --with-system-config
* Add example configuration documentation.Stef Walter2011-08-011-0/+9
* And also install example pkcs11.conf file.