-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
On Thu, May 03, 2018 at 05:36:28PM +0200, viq wrote:
> On 18-05-03 15:34:31, Marek Marczykowski-G贸recki wrote:
> > On Thu, May 03, 2018 at 03:22:53PM +0200, viq wrote:
> > > On 18-04-26 08:01:00, Patrick Schleizer wrote:
> > > > viq:
> > > > > I'm somewhat experienced with salt, are there any areas where additional
> > > > > set of eyes/hands would be useful?
> > > > >
> > > > > Sorry, my python skills are slowly approaching what could be called
> > > > > "basic", so don't count on much from that side.
> > > > >
> > > >
> > > > The release of Whonix 14 is currently blocked due to missing salt files.
> > > >
> > > > Qubes-Whonix 14 SaltStack state files required
> > > >
> > > > https://github.com/QubesOS/qubes-issues/issues/3765
> > > >
> > > > If you could help out with that one, that would be amazing!
> > >
> > > I started looking at it, which led me to anon-whonix state [0] and
> > > related, and unless I'm missing something the first, simplest, naive
> > > approach would be to append "-14" to all references of templates,
> > > something like this commit [1]. Which seems way too simple, so please
> > > tell me what am I missing besides the "we want to control it via a
> > > variable" :)
> >
> > I think it's that simple. But as you've said, better add pillar for
> > that, so one could easily switch later to 15 or so.
>> OK, then an attempt at doing that in another commit [2]. I tried to make it
> so that the default version ("14") could be changed in one spot, I'm not
> certain that adding to the load macro is the right spot - or is it?
> Also, I realised I'm most likely not using it correctly, thus [3],
Template processing order probably is wrong in [2] -
defaults.whonix_version is defined only in `load` function, but you try
to use it while defining `defaults`.
> but I
> think a single place to define the default version instead of
> {{ salt['pillar.get']('qvm:whonix:version', '14') }} throughout multiple
> files would be better.
I think you can create a single helper file with just {% set
whonix_version ... %} and include it wherever you need.
> > Thanks for looking into it!
> >
> > > As a side note, while it may be late for that, I think I'd prefer to have
> > > DVM name be closer to AppVM names than template names. When we'd have eg
> > > whonix-ws-14 and based on in anon-whonix, DVM for me should be named
> > > anon-whonix-dvm, and not whonix-ws-dvm. Or should it be
> > > whonix-ws-14-dvm, and anon-whonix preference for DVM adjusted when we
> > > get whonix 15?
>> Part of my modifications creates whonix-ws-{{ version }}-dvm
>> > > [0] https://github.com/QubesOS/qubes-mgmt-salt-dom0-virtual-machines/blob/master/qvm/anon-whonix.sls
> > > [1] https://github.com/viq/qubes-mgmt-salt-dom0-virtual-machines/commit/857ee77adef6ce970b5d2948804ff04928164525
> [2] https://github.com/viq/qubes-mgmt-salt-dom0-virtual-machines/commit/4b7a07ba8e4b1e5f4aa458a9d2a586bd6730340f
> [3] https://github.com/viq/qubes-mgmt-salt-dom0-virtual-machines/commit/dc5cbf32942548c5753824afce8875c2063b1ef9
- --
Best Regards,
Marek Marczykowski-G贸recki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEhrpukzGPukRmQqkK24/THMrX1ywFAlrrMb4ACgkQ24/THMrX
1yyz3gf/Zc+RK2thRB41gnFZFKv3kHaYsRciIyjoAYnH6RVnfulivnb80vz6T9bI
IwIyArKUWWzobOeOdwVT2UkxGurKQXJboeYQTOk14DDvYfQGT9+QAUi2L5SDRt+L
Y63FGt8ibW0tWzv8R32cMh9CMSprS5HIwCXaxW1ExxS1mljCMMA6PQtbDeGWfinY
Q+EEZLIwTFQnnEDkV8xeh9DLzSLJoRWYiQPUhy4j346dCuRCvG9vP9euDsHHL9tq
7biPYg0bGU1DzOTbhqwN+B5/7R73FERCGQSkn6zbFPovxfxlMh5ZOB4Be1bz9O/Y
1wj3nHf5j4ZdfMT6a8ZqMY0VMPRDZQ==
=ZCBt
-----END PGP SIGNATURE-----
More information about the Whonix-devel
mailing list
“Look here!” Dick began to chuckle. “We’ve got a queer combination to work with—our Sky Patrol has! Suspicious Sandy—and—Superstitious Jeff!” Sandy grinned ruefully, a little sheepishly. Larry smiled and shook his head, warning Dick not to carry his sarcasm any further, as Jeff frowned. 52 "You do doubt me. If you did not, it would never occur to you to deny it. You doubt me now, and you will doubt me still more if you don't read it. In justice to me you must." "That same. She was part Mescalero, anyway." This Act, as disgraceful as any which ever dishonoured the statute-book in the reigns of the Tudors or Stuarts, was introduced into the Commons, on the 12th of May, by Sir William Wyndham, and was resolutely opposed by the Whigs, amongst whom Sir Peter King, Sir Joseph Jekyll, Mr. Hampden, Robert Walpole, and General Stanhope distinguished themselves. They did not convince the majority, which amounted to no less than two hundred and thirty-seven to one hundred and twenty-six. In the Lords, Bolingbroke himself moved the second reading, and it was ably opposed by the Lords Cowper, Wharton, Halifax, Townshend, Nottingham, and others. The greatest curiosity was displayed regarding the part which Oxford would take, as it was known that in the Council he had endeavoured to soften the rigorous clauses; but in the House he followed his usual shuffling habit, declaring that he had not yet considered the question; and, having induced the Opposition to let the second reading pass without a division, he absented himself from the final voting, and thus disgusted both parties and hastened his own fall. The battle of Falkirk, which in itself appeared so brilliant an affair for Prince Charles, was really one of his most serious disasters. The Highlanders, according to their regular custom when loaded with plunder, went off in great numbers to their homes with their booty. His chief officers became furious against each other in discussing their respective merits in the battle. Lord George Murray, who had himself behaved most bravely in the field, complained that Lord John Drummond had not exerted himself, or pursuit might have been made and the royal army been utterly annihilated. This spirit of discontent was greatly aggravated by the siege of the castle of Stirling. Old General Blakeney, who commanded the garrison, declared he would hold out to the last man, in spite of the terrible threats of Lord George Murray if he did not surrender. The Highlanders grew disgusted with work so contrary to their habits; and, indeed, the French engineer, the so-called Marquis de Mirabelle, was so utterly ignorant of his profession, that the batteries which he constructed were commanded by the castle, and the men were so much exposed that they were in danger of being destroyed before they took the fortress. Accordingly, on the 24th of January they struck to a man, and refused to go any more into the trenches. "Haint we bit off more'n we kin chaw. Shorty?" asked Si, as he looked over the increasing gang. "Hadn't we better ask for some help?" "How far would it carry?" Corpril, Company Q, 2 Hundsrdth Injiamiy Volintear "He d?an't care much. F?ather, he likes to be comfortable, and this Inclosure w?an't make much difference to that. 'T?un't as if we wanted the pasture badly, and F?ather he d?an't care about land." "Byles," interrupted Calverley, speaking rapidly, "you are poor—you are in arrear with your rent; a distress will be levied, and then what will become of you—of your wife and the little one? Listen to me! I will give you money to keep a house over your head; and when I am steward, you shall have the first farm at my lord's disposal, if you will only aid me in my revenge! Revenge!" he repeated, vehemently—"but you hesitate—you refuse." "Yes, yes, there is little doubt of that: but how can we come at the truth? Sudbury still retains his wrath against us, and would oppose an arrest; and even could he be waylaid, and brought hither, he is stubborn, and might refuse to answer." HoME一级做人爱c视正版免费
ENTER NUMBET 0017 richi0.net.cn utime.net.cn www.erli0.net.cn www.lgrinc.com.cn www.hege2.net.cn www.laoma3.com.cn romyparis.com.cn www.597888.com.cn www.fahen0.net.cn 862675.org.cn