summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-17Merge branch 'joeyconfig'Joey Hess
2014-11-17Git: rename isRepo to isGitDirFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-17Git: isRepoFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-17propellor spinJoey Hess
2014-11-17DigitalOcean.distroKernel property now reboots into the distribution kernel ↵Joey Hess
when necessary. It might be better to do this check on boot to limit the time running the DO kernel (which is not well security supported), but that has the possibility of entering a bad reboot loop. Limiting this check to when propellor runs avoids that, while still fixing the problem pretty fast.
2014-11-15Convert GpgKeyId to newtypeJoey Hess
2014-11-15update emailJoey Hess
2014-11-15Revert "moving privdata to privdata.joey (for joeyconfig branch only)"Joey Hess
This reverts commit 269996e25d8f5481024f472a57debfd51dfcc703.
2014-11-15Merge branch 'joeyconfig'Joey Hess
Conflicts: privdata.joey/keyring.gpg privdata.joey/privdata.gpg
2014-11-15moving privdata to privdata.joey (for joeyconfig branch only)Joey Hess
This will be reverted on master. This way, my ongoing development on my joeyconfig branch, including privdata changes, won't result in changes being merged into the privdata/ dir on master. Such changes can cause problems for other propellor users, who can get conflicts in their own privdata when merging from master.
2014-11-15add Obnam backupEncryptedJoey Hess
This after I typoed an obnam setup and accidentially had a repo that was backing up non-encrypted.
2014-11-13Merge branch 'joeyconfig'Joey Hess
2014-11-13addJoey Hess
2014-11-13Merge branch 'joeyconfig'Joey Hess
2014-11-13Tor: change unlines to unwords in hiddenServiceFélix Sipma
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
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>