cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,215 Commits 1 Branch 0 Tags 6.6 MiB
Commit Graph

2215 Commits

Author SHA1 Message Date
Joey Hess fcf4ad8464
propellor spin 2014-11-17 23:57:16 -04:00
Joey Hess 8f88d45032
propellor spin 2014-11-17 20:21:21 -04:00
Joey Hess 2fab1a08b4 Merge branch 'joeyconfig' 2014-11-17 17:02:47 -04:00
Félix Sipma fbd8ea3b3d Git: rename isRepo to isGitDir 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-17 17:02:31 -04:00
Félix Sipma f3beea212c Git: isRepo 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-17 17:02:31 -04:00
Joey Hess 0847118cc4
propellor spin 2014-11-17 16:42:37 -04:00
Joey Hess 46cd2ad0e0 DigitalOcean.distroKernel property now reboots into the distribution kernel 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-17 16:42:15 -04:00
Joey Hess 8d91b5de6b Convert GpgKeyId to newtype 2014-11-15 17:02:30 -04:00
Joey Hess 7902f705b0 update email 2014-11-15 15:03:54 -04:00
Joey Hess 90f5cff061 Revert "moving privdata to privdata.joey (for joeyconfig branch only)" 
This reverts commit 269996e25d.
 2014-11-15 13:47:23 -04:00
Joey Hess beb905be92 Merge branch 'joeyconfig' 
Conflicts:
	privdata.joey/keyring.gpg
	privdata.joey/privdata.gpg
 2014-11-15 13:46:53 -04:00
Joey Hess 269996e25d moving privdata to privdata.joey (for joeyconfig branch only) 
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-15 13:45:23 -04:00
Joey Hess d65337d3e7
add Obnam backupEncrypted 
This after I typoed an obnam setup and accidentially had a repo that was
backing up non-encrypted.
 2014-11-15 13:42:04 -04:00
Joey Hess 90a982fcb3 Merge branch 'joeyconfig' 2014-11-13 13:11:31 -04:00
Joey Hess d14fd55641 add 2014-11-13 13:11:31 -04:00
Joey Hess 4dd53172ec Merge branch 'joeyconfig' 2014-11-13 13:03:37 -04:00
Félix Sipma cd1a911314 Tor: change unlines to unwords in hiddenService 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-13 13:03:30 -04:00
Joey Hess 72fac5e968 Merge branch 'joeyconfig' 2014-11-12 18:09:27 -04:00
Félix Sipma 3679a49353 Tor: change unlines to unwords in description messages 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-12 18:09:21 -04:00
Joey Hess 2561067798 Merge remote-tracking branch 'origin/master' 2014-11-11 20:05:26 -04:00
Joey Hess eba2d3d2cd Merge branch 'joeyconfig' 
Conflicts:
	privdata/privdata.gpg
 2014-11-11 20:04:55 -04:00
Félix Sipma e7d2c38a59 Tor: hiddenServiceData 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-11 20:02:23 -04:00
Félix Sipma 9d6a79bc23 Apt: stable-updates suite 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-11 19:57:39 -04:00
http://joeyh.name/ 39040ab325 removed 2014-11-11 21:16:37 +00:00
http://joeyh.name/ 5894cb0e81 Added a comment 2014-11-11 21:16:09 +00:00
http://joeyh.name/ 74c9ab8f5d Added a comment 2014-11-11 21:15:57 +00:00
gueux d6ad138aa0 2014-11-11 18:12:00 +00:00
Joey Hess 499cebd3c7
propellor spin 2014-11-11 13:59:09 -04:00
Joey Hess 08ff95fbfa Merge branch 'joeyconfig' 2014-11-11 13:47:25 -04:00
Joey Hess 05a793dd59 should be fixed 2014-11-11 13:47:22 -04:00
Joey Hess e4f9df8404 avoid configuring git signing key when there's no secret key 
Also, nice display for --add-key steps
 2014-11-11 13:41:25 -04:00
Arnaud Bailly 4c19e8407d added some details to multipe gpg keys issue 2014-11-11 13:30:32 -04:00
Joey Hess 51cb668e5c unundo 2014-11-11 13:30:29 -04:00
Joey Hess 7ea0f460e6 use --trust-model always to avoid prompt from gpg 
gpg prompts when encrypting to an untrusted key, but if propellor has been
told to add a key, we implicitly trust it.
 2014-11-11 13:26:31 -04:00
Joey Hess be27ae1503 changelog 2014-11-11 13:00:33 -04:00
Joey Hess 84304821be
propellor spin 2014-11-11 12:58:53 -04:00
Joey Hess f559ccaf73 reorg 2014-11-11 12:33:04 -04:00
Joey Hess 347c02a38e split out gpg keyring related stuff 2014-11-11 12:32:17 -04:00
Joey Hess bd7869c01c Merge branch 'joeyconfig' 2014-11-11 12:02:18 -04:00
Félix Sipma bd856f7a04 Tor: varRun 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-11 11:57:42 -04:00
Félix Sipma 2368b0d5af Tor: rename 'varPath' to 'varLib' 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-11 11:57:39 -04:00
Félix Sipma 1f328755f5 Tor: mainConfig, varPath, hidden service by hostname 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-11 11:57:38 -04:00
Joey Hess 250ab151a2 Merge branch 'joeyconfig' 2014-11-11 10:38:14 -04:00
Joey Hess 8e974f5641 update 2014-11-11 10:38:14 -04:00
Joey Hess 17d81326ba Merge branch 'joeyconfig' 2014-11-10 16:27:52 -04:00
Joey Hess d8ca671086 didn't need quite so much indentation 2014-11-10 16:27:36 -04:00
Joey Hess 3145346fb8 Merge branch 'joeyconfig' 2014-11-10 16:22:49 -04:00
Joey Hess 929d26d556 changelog 2014-11-10 16:22:44 -04:00
Félix Sipma 053183d44b Tor: hidden service 
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
 2014-11-10 16:16:43 -04:00
Joey Hess e0a47a59d9 Merge branch 'joeyconfig' 2014-11-10 11:15:47 -04:00