beb905be92
Merge branch 'joeyconfig'
...
Conflicts:
privdata.joey/keyring.gpg
privdata.joey/privdata.gpg
2014-11-15 13:46:53 -04:00
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
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
90a982fcb3
Merge branch 'joeyconfig'
2014-11-13 13:11:31 -04:00
d14fd55641
add
2014-11-13 13:11:31 -04:00
4dd53172ec
Merge branch 'joeyconfig'
2014-11-13 13:03:37 -04:00
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
72fac5e968
Merge branch 'joeyconfig'
2014-11-12 18:09:27 -04:00
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
2561067798
Merge remote-tracking branch 'origin/master'
2014-11-11 20:05:26 -04:00
eba2d3d2cd
Merge branch 'joeyconfig'
...
Conflicts:
privdata/privdata.gpg
2014-11-11 20:04:55 -04:00
e7d2c38a59
Tor: hiddenServiceData
...
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11 20:02:23 -04:00
9d6a79bc23
Apt: stable-updates suite
...
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11 19:57:39 -04:00
39040ab325
removed
2014-11-11 21:16:37 +00:00
5894cb0e81
Added a comment
2014-11-11 21:16:09 +00:00
74c9ab8f5d
Added a comment
2014-11-11 21:15:57 +00:00
d6ad138aa0
2014-11-11 18:12:00 +00:00
499cebd3c7
propellor spin
2014-11-11 13:59:09 -04:00
08ff95fbfa
Merge branch 'joeyconfig'
2014-11-11 13:47:25 -04:00
05a793dd59
should be fixed
2014-11-11 13:47:22 -04:00
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
4c19e8407d
added some details to multipe gpg keys issue
2014-11-11 13:30:32 -04:00
51cb668e5c
unundo
2014-11-11 13:30:29 -04:00
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
be27ae1503
changelog
2014-11-11 13:00:33 -04:00
84304821be
propellor spin
2014-11-11 12:58:53 -04:00
f559ccaf73
reorg
2014-11-11 12:33:04 -04:00
347c02a38e
split out gpg keyring related stuff
2014-11-11 12:32:17 -04:00
bd7869c01c
Merge branch 'joeyconfig'
2014-11-11 12:02:18 -04:00
bd856f7a04
Tor: varRun
...
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-11 11:57:42 -04:00
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
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
250ab151a2
Merge branch 'joeyconfig'
2014-11-11 10:38:14 -04:00
8e974f5641
update
2014-11-11 10:38:14 -04:00
17d81326ba
Merge branch 'joeyconfig'
2014-11-10 16:27:52 -04:00
d8ca671086
didn't need quite so much indentation
2014-11-10 16:27:36 -04:00
3145346fb8
Merge branch 'joeyconfig'
2014-11-10 16:22:49 -04:00
929d26d556
changelog
2014-11-10 16:22:44 -04:00
053183d44b
Tor: hidden service
...
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-10 16:16:43 -04:00
e0a47a59d9
Merge branch 'joeyconfig'
2014-11-10 11:15:47 -04:00
9608a390d2
Added prosody module, contributed by Félix Sipma.
2014-11-10 11:15:41 -04:00
3541260436
basic prosody support
...
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
2014-11-10 11:14:48 -04:00
a6fba965a4
add news item for propellor 0.9.2
2014-11-08 16:09:26 -04:00
de50503e4d
Merge branch 'joeyconfig'
2014-11-08 15:57:56 -04:00
f3a31c9192
prep release
2014-11-08 15:57:46 -04:00
1187cd4901
Orphaned the Debian package, as I am retiring from Debian.
2014-11-08 15:57:33 -04:00
f38cd7c6a5
Merge branch 'joeyconfig'
2014-11-08 15:56:36 -04:00
9755b761bb
Docker: Stop using docker.io; that was a compat symlink in the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
2014-11-08 15:55:58 -04:00
3313e6ab76
comment
2014-11-06 11:47:20 -04:00
6f9c6625a2
Merge branch 'master' of ssh://propellor.branchable.com
2014-11-06 11:46:50 -04:00
Joey Hess
Félix Sipma
http://joeyh.name/
gueux
Arnaud Bailly