summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-12Merge branch 'joeyconfig'Joey Hess
2014-11-12Tor: change unlines to unwords in description messagesFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11Merge remote-tracking branch 'origin/master'Joey Hess
2014-11-11Merge branch 'joeyconfig'Joey Hess
Conflicts: privdata/privdata.gpg
2014-11-11Tor: hiddenServiceDataFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11Apt: stable-updates suiteFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11removedhttp://joeyh.name/
2014-11-11Added a commenthttp://joeyh.name/
2014-11-11Added a commenthttp://joeyh.name/
2014-11-11(no commit message)gueux
2014-11-11propellor spinJoey Hess
2014-11-11Merge branch 'joeyconfig'Joey Hess
2014-11-11should be fixedJoey Hess
2014-11-11avoid configuring git signing key when there's no secret keyJoey Hess
Also, nice display for --add-key steps
2014-11-11added some details to multipe gpg keys issueArnaud Bailly
2014-11-11unundoJoey Hess
2014-11-11use --trust-model always to avoid prompt from gpgJoey Hess
gpg prompts when encrypting to an untrusted key, but if propellor has been told to add a key, we implicitly trust it.
2014-11-11changelogJoey Hess
2014-11-11propellor spinJoey Hess
2014-11-11reorgJoey Hess
2014-11-11split out gpg keyring related stuffJoey Hess
2014-11-11Merge branch 'joeyconfig'Joey Hess
2014-11-11Tor: varRunFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11Tor: rename 'varPath' to 'varLib'Félix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11Tor: mainConfig, varPath, hidden service by hostnameFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11Merge branch 'joeyconfig'Joey Hess
2014-11-11updateJoey Hess
2014-11-10Merge branch 'joeyconfig'Joey Hess
2014-11-10didn't need quite so much indentationJoey Hess
2014-11-10Merge branch 'joeyconfig'Joey Hess
2014-11-10changelogJoey Hess
2014-11-10Tor: hidden serviceFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-10Merge branch 'joeyconfig'Joey Hess
2014-11-10Added prosody module, contributed by Félix Sipma.Joey Hess
2014-11-10basic prosody supportFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-08add news item for propellor 0.9.2Joey Hess
2014-11-08Merge branch 'joeyconfig'Joey Hess
2014-11-08prep releaseJoey Hess
2014-11-08Orphaned the Debian package, as I am retiring from Debian.Joey Hess
2014-11-08Merge branch 'joeyconfig'Joey Hess
2014-11-08Docker: Stop using docker.io; that was a compat symlink in the Debian ↵Joey Hess
package which has been removed in docker.io 1.3.1~dfsg1-2.
2014-11-06commentJoey Hess
2014-11-06Merge branch 'master' of ssh://propellor.branchable.comJoey Hess
2014-11-06(no commit message)gueux
2014-11-05oopsJoey Hess
2014-11-01reorgJoey Hess
2014-11-01Merge branch 'joeyconfig'Joey Hess
2014-11-01add tip about indentation for emacs usersArnaud Bailly
Signed-off-by: Arnaud Bailly <arnaud.oqube@gmail.com>
2014-10-31Merge branch 'joeyconfig'Joey Hess
2014-10-31cleanupJoey Hess