Reorganizes mimetype declarations for template consolidation #198
Conversation
Updates the config filepath in the rpc spec. Related PRs: * freedomofpress/securedrop-proxy#79 * freedomofpress/securedrop-builder#198
Strictly for use with template-consolidation channel, for debugging. Again, see related PR in: freedomofpress/securedrop-builder#198
conorsch
force-pushed
the
mimetype-reorg-for-all
branch
from
f22cb2b to
cdda326
Compare
Updates the config filepath in the rpc spec. Related PRs: * freedomofpress/securedrop-proxy#79 * freedomofpress/securedrop-builder#198
Strictly for use with template-consolidation channel, for debugging. Again, see related PR in: freedomofpress/securedrop-builder#198
|
Noting that the mimetype config for the sd-export package is still in the system volume [1] (through overriden by the private volume configation after running the salt logic). Ideally, we would want /usr/share/applications/mimeapps.list to default to [1] https://github.com/freedomofpress/securedrop-debian-packaging/blob/mimetype-reorg-for-all/securedrop-export/debian/securedrop-export.install#L4-L5 |
Good eye. The need to update |
|
There are a few more changes that should be made before final review. For reference: Remaining tasks:
The above changes should eventually get PRs in the respective components repos, but are not strictly necessary to further testing here: as long as the files in question are excised from the package spec, we can follow up with more housekeeping to remove from the tarball generated in the component repos. |
Follows packaging PR, just to evaluate CI behavior. This commit should not be merged. freedomofpress/securedrop-builder#198
conorsch
force-pushed
the
mimetype-reorg-for-all
branch
from
cdda326 to
34cde90
Compare
As part of template consolidation [0], we've moved all mimetype associations into the "securedrop-workstation-config" package [1]. The "open-in-dvm" desktop file now resides in the same package [2]. [0] freedomofpress/securedrop-workstation#471 [1] freedomofpress/securedrop-builder#190 [2] freedomofpress/securedrop-builder#198
Removes mimetypes, given that they're now provided in `securedrop-workstation-config`. See corresponding changes in: * freedomofpress/securedrop-client#1160 * freedomofpress/securedrop-builder#198
For testing template consolidation, we want a newer version to install via a custom channel. See related changes in freedomofpress/securedrop-builder#198
| @@ -1,5 +1,6 @@ | |||
| mimeapps.list.sd-viewer opt/sdw/ | |||
| mimeapps.list.sd-app opt/sdw/ | |||
| mimeapps.list.sd-app opt/sdw/mimeapps.list.default | |||
There was a problem hiding this comment.
Based on local testing, this will create a folder /opt/sdw/mimeapps.list.default/ and copy mimeapps.list.sd-app in that folder.
There was a problem hiding this comment.
Thanks, good catch. Pulled in your commit, added another, and built the package: freedomofpress/securedrop-apt-test#70
Follows packaging PR, just to evaluate CI behavior. This commit should not be merged. freedomofpress/securedrop-builder#198
Adjusts mimetypes handling, consolidating into a single package as much as possible. See: freedomofpress/securedrop-builder#198
|
(This is being tested as part of testing freedomofpress/securedrop-workstation#619 , let's not forget to give it the approval stamp when ready, so it can be merged along with the other consolidation PRs.) |
There was a problem hiding this comment.
Looks good to me, packages are already on apt test and working as expected and have had ample testing as part of review of freedomofpress/securedrop-workstation#619
Two minor comments that shouldn't block merge (but we should be mindful prior to merge)
| @@ -1,3 +1,9 @@ | |||
| securedrop-client (0.2.2+buster) unstable; urgency=medium | |||
There was a problem hiding this comment.
Version bump in freedomofpress/securedrop-client#1160 is marked as temporary, we should either bump the client version and add the changelog as part of 1160 or in a separate PR, prior to merging this changelog addition here.
There was a problem hiding this comment.
Good point. I'll remove the version bump in freedomofpress/securedrop-client#1160, as well as remove the version bump in this PR. For nightlies, that'll be good enough: the consolidation logic additions we wish to QA will be available in apt-test main.
| @@ -1,2 +1 @@ | |||
| mimeapps.list usr/share/applications/ | |||
| paxctld.conf.svsdisp opt/ | |||
There was a problem hiding this comment.
the pax flags are also handled by the config package[1] , we can also remove this and relevant postinst chances
Given that this package will not be installed in consolidated template, we don't strictly need to add this here, we can just remove all the workstation-svs-disp related stuff after we release consolidated templates.
[1] https://github.com/freedomofpress/securedrop-debian-packaging/pull/190/files
There was a problem hiding this comment.
we can just remove all the workstation-svs-disp related stuff after we release consolidated templates.
Right, that was my plan: we'll circle back and delete all these packages once the release has shipped. I don't see a pressing need to do that right now.
As part of template consolidation [0], we've moved all mimetype associations into the "securedrop-workstation-config" package [1]. The "open-in-dvm" desktop file now resides in the same package [2]. [0] freedomofpress/securedrop-workstation#471 [1] freedomofpress/securedrop-builder#190 [2] freedomofpress/securedrop-builder#198
The sd-proxy VM was using a legacy "do-not-open-here" warning, a vestigate from early Workstation prototypes before DispVMs were used to handle submissions. It's no longer required. A saner default is actually the open-in-dvm, since the SDW default DispVM is netless, and therefore quite safe. Let's use that.
Moves the `securedrop-workstation-svs-disp` mimeapps.list config into the `securedrop-workstation-config` package, same as for the other Workstation components. The same file was already referenced in the config, so don't need to readd it.
Adds new metapackage with a clean history, to aid in template consolidation. Attempts to override the old package, causing it automatically be removed, via Replaces/Conflicts [0]. The dependencies are the same, although reordered, with one exception: "evince" has been pulled in so we can remove it from the salt config. [0] https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces Bumps securedrop-workstation-viewer to 0.1.1 Fixes a typo in the control file, which was pointing to a non-existent package and trying to supersede it.
Updates the RPC file in the code repo, then rebuilds based on new version. See related PR in: freedomofpress/securedrop-proxy#79
See matching changes in: freedomofpress/securedrop-export#65
Pointed out by @emkll during review, the ".install" declarations use directories as dest, so we can't write a file that way. Added to postinst, along with the other setups. Technically we could reuse the ".sd-app" mimetype config elsewhere, but using a ".default" name for it keeps the door open on divergence in the future, and matches what we've been testing as part of template consolidation.
conorsch
force-pushed
the
mimetype-reorg-for-all
branch
from
21d2e82 to
6669226
Compare
|
@emkll I removed the version bump commits for all packages with other PRs, so we can adhere to standard procedure and bump separately. I've left in the commits bumping version for packages that are maintained entirely within this repo, however. If you'd like those removed too, just say so. Ready for final review. |
|
Thanks for careful review, @emkll. Merging now. Let's make sure to nudge CI in the component repos, so this new build logic is picked up post-merge. |
Follow up to #198. Omitted in the final version for review.
The svs-disp package was made obsolete in Oct. 2020 (freedomofpress/securedrop-builder#198), and given the fresh installs for both 4.1 and 4.2 since then, there's no need to continue keeping the Provides/Conflicts/Replaces stanzas.
Towards freedomofpress/securedrop-workstation#471
Closes #197
Includes updates to packages for the Workstation, in order to achieve template consolidation. These packages are currently being served via a "template-consolidation" channel on apt-test: freedomofpress/securedrop-apt-test#65 Specifically, the changes presented here are:
securedrop-workstation-viewer, supersedingsecuredrop-workstation-svs-disp, thereby closing Create new metapackage to track application dependencies for sd-viewer based dispVMs #197securedrop-proxypackage, adjusting the config filepath, built from Moves config to private volume securedrop-proxy#79securedrop-export&securedrop-clientto remove mimetype associations (building on work from Provide mime and paxctld configuration for template consolidation #190)securedrop-workstation-configto provide default mimetype assocations foropen-in-dvmTesting
Check out freedomofpress/securedrop-workstation#619, which will configure both of these new packages via a custom apt-test channel. There's also a detailed test plan at https://github.com/freedomofpress/securedrop-workstation/wiki/0.5.0-Test-Plan