From 38b4da9360d1abfc4e9767ad15076dd3a0960dfc Mon Sep 17 00:00:00 2001 From: spwhitton Date: Thu, 18 Apr 2019 20:58:35 +0000 Subject: Added a comment: patches submitted --- .../comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment diff --git a/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment new file mode 100644 index 00000000..75f6afd5 --- /dev/null +++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_9_9d1cf538e0b1f560bac9b031b892a68c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="patches submitted" + date="2019-04-18T20:58:35Z" + content=""" +I've just mailed patches addressing this to Joey. +"""]] -- cgit v1.2.3 From cbf2f35d17bf2a229e17ac3d6d96a2e88d8d2ff3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Apr 2019 22:12:37 -0400 Subject: wording To me, "standardly" seemed to imply the property might be included by default, but it is not. --- src/Propellor/Property/Sbuild.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 3de82af3..26e7ae8e 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -270,7 +270,7 @@ update = Apt.update `before` Apt.upgrade `before` Apt.autoRemove -- | Ensure that an sbuild schroot uses the host's Apt proxy. -- --- This property is standardly used when the host has 'Apt.useLocalCacher'. +-- This property is typically used when the host has 'Apt.useLocalCacher'. useHostProxy :: Host -> Property DebianLike useHostProxy h = property' "use host's apt proxy" $ \w -> -- Note that we can't look at getProxyInfo outside the property, -- cgit v1.2.3 From d1038d34b16be9d8a56f1ead6afea53f39d04d4a Mon Sep 17 00:00:00 2001 From: desired.mta@88576fa3c90538abed47d3f0aa48d00bcc903b23 Date: Sat, 20 Apr 2019 09:10:52 +0000 Subject: Added a comment --- ...ent_3_5fa856434db0d285874ac3f468ab792e._comment | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment diff --git a/doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment b/doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment new file mode 100644 index 00000000..5173511c --- /dev/null +++ b/doc/forum/build_propellor_binary/comment_3_5fa856434db0d285874ac3f468ab792e._comment @@ -0,0 +1,38 @@ +[[!comment format=mdwn + username="desired.mta@88576fa3c90538abed47d3f0aa48d00bcc903b23" + nickname="desired.mta" + avatar="http://cdn.libravatar.org/avatar/d93af7ba58088a39d04c7da13fc176ee" + subject="comment 3" + date="2019-04-20T09:10:52Z" + content=""" +Thanks for your responses! I wasn't aware there was prior work done on this. + +`origin/precompiled` did not build for me. But when I merged master into it, and patching around a trivial merge conflict, I got this: + +``` +[ 58 of 182] Compiling Propellor.Property ( src/Propellor/Property.hs, dist/build/Propellor/Property.o ) + +src/Propellor/Property.hs:364:13: error: + * Could not deduce (Monoid (Property (MetaTypes t))) + arising from a use of `mempty' + from the context: SingI t + bound by the type signature for: + doNothing :: forall k (t :: k). SingI t => Property (MetaTypes t) + at src/Propellor/Property.hs:363:1-46 + * In the expression: mempty + In an equation for `doNothing': doNothing = mempty + | +364 | doNothing = mempty + | ^^^^^^ +``` + +Unfortunately, I am not versed enough in Haskell to understand the error. + + +``` +$ ghc --version +The Glorious Glasgow Haskell Compilation System, version 8.4.4 +``` + +Here is my merged fork (based on 38b4da93 and origin/precompiled at 7d550c75): if you can `make` it: [github.com/motiejus/propellor](https://github.com/motiejus/propellor), and tell me how to fix the above error, I would try to test it functionally further. +"""]] -- cgit v1.2.3 From b9b50d9f13233df08f01695beb022138a210d697 Mon Sep 17 00:00:00 2001 From: Nicolas.Schodet Date: Sat, 20 Apr 2019 21:54:16 +0000 Subject: Added a comment --- ...ent_4_db1a195688aa23e99b0aca9e776fd4ac._comment | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment diff --git a/doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment b/doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment new file mode 100644 index 00000000..f6d33302 --- /dev/null +++ b/doc/forum/Getting_Info_from_containers/comment_4_db1a195688aa23e99b0aca9e776fd4ac._comment @@ -0,0 +1,41 @@ +[[!comment format=mdwn + username="Nicolas.Schodet" + avatar="http://cdn.libravatar.org/avatar/0d7ec808ec329d04ee9a93c0da3c0089" + subject="comment 4" + date="2019-04-20T21:54:16Z" + content=""" +After thinking about it, it would be nicer if an Host could give information about +several of its children, that would be a larger change, but having the wrapper +would then be useless and propellor would be able to find containers +automatically. + +As a container is created by a property, a container Host could be included in +Info of a Host. If an entry is to be propagated, then it is added as an entry +of the host, else it is kept as an entry of the container. + +When looking up a host, we have to search for one Host of a [Host] list, but +also for any Host listed in the containersInfo of all the listed Host. + +Not sure this is clear, here is a example to try to make it clearer: + + hard_node :: Host + hostName = \"hard-node.example.org\" + hostProperties = ... + hostInfo = + [ a HostKeyInfo for riva + , a DnsInfoUnpropagated for riva + , a DnsInfoPropagated from container-web + , a ContainersInfo = + [ container_web :: Host + hostName = \"container-web\" + hostProperties = ... + hostInfo = + [ a HostKeyInfo for container-web + , a DnsInfoUnpropagated for container-web + ] + , container_git :: Host + ... + ] + ] + +"""]] -- cgit v1.2.3 From 73ae7e6ea5b483a3eaf72ed50918694c2b9a9642 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Apr 2019 13:15:02 -0400 Subject: commen --- .../comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment diff --git a/doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment b/doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment new file mode 100644 index 00000000..eff55db0 --- /dev/null +++ b/doc/forum/build_propellor_binary/comment_4_d5bf3e9f7a7e01fd6b55b2e761c8cc2e._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2019-04-22T17:14:20Z" + content=""" +I've fixed the build of origin/precompiled +"""]] -- cgit v1.2.3 From 32c1e68cfcef57d86fbf8c19743494ee4b9f1a4f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 22 Apr 2019 12:36:30 -0700 Subject: fix Git.pulled always reporting a change Signed-off-by: Sean Whitton --- src/Propellor/Property/Git.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs index e7dcb80c..a0ed4f02 100644 --- a/src/Propellor/Property/Git.hs +++ b/src/Propellor/Property/Git.hs @@ -110,7 +110,7 @@ pulled owner url dir mbranch = go [ "cd " ++ shellEscape dir , "git pull" ] - `changesFile` (dir ".git" "FETCH_HEAD") + `changesFileContent` (dir ".git" "FETCH_HEAD") isGitDir :: FilePath -> IO Bool isGitDir dir = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", dir]) -- cgit v1.2.3 From b19b4d236a519a24246a43698d5264db9ecbb92e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Apr 2019 16:39:31 -0400 Subject: update --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index b7dafc8c..139a2a30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ propellor (5.8.0) UNRELEASED; urgency=medium exist. * Ssh.userKeyAt: When a relative filepath is provided, it's put inside the user's .ssh directory. + * fix Git.pulled always reporting a change + Thanks, Sean Whitton -- Joey Hess Mon, 08 Apr 2019 11:09:04 -0400 -- cgit v1.2.3 From 6d2af1a9e9d1c6b5cabd8d8c2e8f407126694ea3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Apr 2019 16:39:35 -0400 Subject: clean up after merge --- config.hs | 2 +- privdata/relocate | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index 97d90636..ec313725 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -joeyconfig.hs \ No newline at end of file +config-simple.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate deleted file mode 100644 index 271692d8..00000000 --- a/privdata/relocate +++ /dev/null @@ -1 +0,0 @@ -.joeyconfig -- cgit v1.2.3 From 889e262ca0c3e522b81fa3ecf4cf2b3fe6aa9fdb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 26 Apr 2019 08:24:33 -0400 Subject: releasing package propellor version 5.8.0 --- debian/changelog | 6 +++--- propellor.cabal | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 139a2a30..d681637d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (5.8.0) UNRELEASED; urgency=medium +propellor (5.8.0) unstable; urgency=medium * Fix bug in File.containsShellSetting that replaced whole shell conffile content with the setting if the file did not previously contain a line @@ -14,10 +14,10 @@ propellor (5.8.0) UNRELEASED; urgency=medium exist. * Ssh.userKeyAt: When a relative filepath is provided, it's put inside the user's .ssh directory. - * fix Git.pulled always reporting a change + * Fix Git.pulled always reporting a change. Thanks, Sean Whitton - -- Joey Hess Mon, 08 Apr 2019 11:09:04 -0400 + -- Joey Hess Fri, 26 Apr 2019 08:23:29 -0400 propellor (5.7.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 4062c0fb..cde447e2 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 5.7.0 +Version: 5.8.0 Cabal-Version: 1.20 License: BSD2 Maintainer: Joey Hess -- cgit v1.2.3 From d3241a72983578f6b45b518d0b29918955b04956 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 26 Apr 2019 08:24:40 -0400 Subject: add news item for propellor 5.8.0 --- doc/news/version_5.4.1.mdwn | 14 -------------- doc/news/version_5.8.0.mdwn | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 doc/news/version_5.4.1.mdwn create mode 100644 doc/news/version_5.8.0.mdwn diff --git a/doc/news/version_5.4.1.mdwn b/doc/news/version_5.4.1.mdwn deleted file mode 100644 index ebb0e261..00000000 --- a/doc/news/version_5.4.1.mdwn +++ /dev/null @@ -1,14 +0,0 @@ -propellor 5.4.1 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Modernized and simplified the MetaTypes implementation now that - compatability with ghc 7 is no longer needed. - * Use git verify-commit to verify gpg signatures, rather than the old - method of parsing git log output. Needs git 2.0. - * Added ConfFile.containsShellSetting, ConfFile.lacksShellSetting, - and EtcDefault.set properties. Thanks, Sean Whitton - * Dns: Support TXT values longer than bind's maximum string length - of 255 bytes. Thanks, rsiddharth. - * Docker and HostingProvider.CloudAtCost modules are not being - maintained, so marked them as such. - Seeking a maintainer for the Docker module; I anticipate - removing the CloudAtCost module in the next API bump."""]] \ No newline at end of file diff --git a/doc/news/version_5.8.0.mdwn b/doc/news/version_5.8.0.mdwn new file mode 100644 index 00000000..a00c611a --- /dev/null +++ b/doc/news/version_5.8.0.mdwn @@ -0,0 +1,18 @@ +propellor 5.8.0 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix bug in File.containsShellSetting that replaced whole shell conffile + content with the setting if the file did not previously contain a line + setting the key to some value. + * Removed inChroot, instead use hasContainerCapability FilesystemContained. + (API change) + * Hostname: Properties that used to not do anything in a systemd or + docker container will now change the container's hostname, + since it's namespaced. + * Add User.ownsWithPrimaryGroup + Thanks, Sean Whitton + * Ssh.userKeys, Ssh.userKeyAt: Create .ssh directory when it does not yet + exist. + * Ssh.userKeyAt: When a relative filepath is provided, it's put inside + the user's .ssh directory. + * Fix Git.pulled always reporting a change. + Thanks, Sean Whitton"""]] \ No newline at end of file -- cgit v1.2.3 From f8c71a10571dd50986eecc63f687e7e47a87cf4f Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sat, 18 May 2019 19:32:58 +0000 Subject: post TODO --- doc/todo/virtio-fs_image_type_for_Propellor.Property.Libvirt.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/virtio-fs_image_type_for_Propellor.Property.Libvirt.mdwn diff --git a/doc/todo/virtio-fs_image_type_for_Propellor.Property.Libvirt.mdwn b/doc/todo/virtio-fs_image_type_for_Propellor.Property.Libvirt.mdwn new file mode 100644 index 00000000..841a2c9f --- /dev/null +++ b/doc/todo/virtio-fs_image_type_for_Propellor.Property.Libvirt.mdwn @@ -0,0 +1,3 @@ +Seems that [the new virtio-fs](https://lwn.net/Articles/788333/) can be used for [the root filesystem of a libvirt VM](https://virtio-fs.gitlab.io/howto-boot.html). That would allow propellor to keep updating the filesystem as it would just be a chroot on the KVM host, rather than an opaque image file. + +--spwhitton -- cgit v1.2.3 From b1c8aa980dd81be8c56ca5bcb0d1c5ea1ef69d8e Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Wed, 29 May 2019 12:43:01 +0000 Subject: New post about merging upstream changes. --- ...stream_changes_into_my_local_propellor_repo.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn new file mode 100644 index 00000000..50578473 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn @@ -0,0 +1,21 @@ +When there were upstream changes available, propellor used to prompt me to +merge upstream changes into my local propellor repo with: + + git merge upstream/master + +Of late, propellor has not been prompting me to merge upstream changes and +my local propellor repo is stuck at ~version 5.3.5 + +Is there is (another manual) way to merge upstream changes into my local propellor +repo? + +My propellor repo is at + + git clone git://git.ricketyspace.net/propellor.git + +Note that I've have some minor updates under the `src/` directory. [Some][0] [of][1] [them][2] were +merged into upstream. + +[0]: https://propellor.branchable.com/forum/DNS_-_Support_for_Multiline_TXT_records/ +[1]: https://propellor.branchable.com/forum/Make_clean_fails_in_openbsd/ +[2]: https://propellor.branchable.com/forum/__96__Propellor.Bootstrap.cabalBuild__96___fails_in_openbsd/ -- cgit v1.2.3 From b8570d735d1ba52ee9c6d8bb1f93d5f9608c34c1 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 29 May 2019 18:46:25 +0000 Subject: --- doc/todo/dhcp_support_for_Propellor.Property.Libvirt.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/todo/dhcp_support_for_Propellor.Property.Libvirt.mdwn diff --git a/doc/todo/dhcp_support_for_Propellor.Property.Libvirt.mdwn b/doc/todo/dhcp_support_for_Propellor.Property.Libvirt.mdwn new file mode 100644 index 00000000..dd1a80d9 --- /dev/null +++ b/doc/todo/dhcp_support_for_Propellor.Property.Libvirt.mdwn @@ -0,0 +1,14 @@ +I'd like a convenient way to add dhcp info for libvirt guests (to libvirt's internal dhcp server). + +I'm thinking something along the lines of + + Libvirt.dhcp "default" (MAC "52:54:00:00:00:01") (IPv4 "192.168.122.31") + +where I guess the MAC (or a better name?) has to be defined. "default" is the libvirt network name. +That property (and the undo) would translate into some call to "virsh net-update". + +This presumably needs a way to assign a matching MAC to the guest. We could maybe provide a convenience API that did both to avoid mismatches. + +I don't so far see a nice way to update the mac address on the guest. There is a --network mac= for virt-install, so maybe an optional parameter for defined? I guess it needs to be different function, called by defined to avoid breaking API? + + -- cgit v1.2.3 From 089ddeb31ce897bd33568ee3cbf90e14ee37bac9 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 30 May 2019 11:08:41 +0000 Subject: --- doc/forum/commands_that_need_files.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/commands_that_need_files.mdwn diff --git a/doc/forum/commands_that_need_files.mdwn b/doc/forum/commands_that_need_files.mdwn new file mode 100644 index 00000000..e4adf063 --- /dev/null +++ b/doc/forum/commands_that_need_files.mdwn @@ -0,0 +1,9 @@ +I want to run "virsh update-device guest-name snippet.xml", for the moment from Cmd.cmdProperty. snippet.xml should contain the actual configuration information. I'm wondering what the best approach is. + +1. create a persistent copy of this file using File.hasContent or similar +2. generate a temporary file when running the property. +3. Use a file from the propellor repo + +(1) is slightly gross because the persistent copy is used only when running propellor. +(2) I don't really know how to do in propellor; I guess it has to do with monads. +(3) I don't know if this will work or is frowned upon for some reason. -- cgit v1.2.3 From c55dff8a1db9afd3c7705c6ba105224b620c4381 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sun, 2 Jun 2019 00:34:48 +0000 Subject: Added a comment --- .../comment_1_e522e00ee4d4b072d80faef748450a52._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment new file mode 100644 index 00000000..3c3623de --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 1" + date="2019-06-02T00:34:48Z" + content=""" +The `upstream/master` thing is probably propellor's code looking in `/usr/src/propellor` for a new upstream version. + +Do you perhaps no longer have the Debian package of propellor installed? +"""]] -- cgit v1.2.3 From 1102a09d5281d96104cb35d1131d1669c27d3881 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sun, 2 Jun 2019 00:35:19 +0000 Subject: Added a comment --- .../comment_1_4ffacadef38a131fa7e22204f9c4f882._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/commands_that_need_files/comment_1_4ffacadef38a131fa7e22204f9c4f882._comment diff --git a/doc/forum/commands_that_need_files/comment_1_4ffacadef38a131fa7e22204f9c4f882._comment b/doc/forum/commands_that_need_files/comment_1_4ffacadef38a131fa7e22204f9c4f882._comment new file mode 100644 index 00000000..c16fc161 --- /dev/null +++ b/doc/forum/commands_that_need_files/comment_1_4ffacadef38a131fa7e22204f9c4f882._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 1" + date="2019-06-02T00:35:19Z" + content=""" +I would use (2). Look for the string `withTmpFile` in Libvirt.hs to see how it's done. +"""]] -- cgit v1.2.3 From c4f893b9e73e5c50387349929baa224ff60c1434 Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Sun, 2 Jun 2019 01:10:43 +0000 Subject: Added a comment --- .../comment_2_3dcd6f95340abed0accfecda716fd1f6._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment new file mode 100644 index 00000000..d59d2ca9 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 2" + date="2019-06-02T01:10:43Z" + content=""" +[@spwhitton](https://propellor.branchable.com/user/spwhitton/), My current host machine is OpenBSD. So, I get propellor from `cabal`. + +Currently I've propellor 5.8.0 installed from cabal. + +My local propellor repo is itself is stuck at 5.3.5 (). + +I wanted to know if there was a way to manually merge upstream changes into my local propellor repo? + +"""]] -- cgit v1.2.3 From 6825bfdf75009428b1babf73f5a7986b30728835 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Mon, 3 Jun 2019 03:43:33 +0000 Subject: Added a comment --- .../comment_3_a273b2f5a904e7b16576a750538296dc._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment new file mode 100644 index 00000000..b2043e80 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 3" + date="2019-06-03T03:43:33Z" + content=""" +You can always just fetch and merge upstream's release tags. +"""]] -- cgit v1.2.3 From c026e0c3c54814a58e96fa3819b225376ec48b75 Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Tue, 4 Jun 2019 00:38:58 +0000 Subject: Added a comment --- ...ent_4_26738f91fe511b49552a68e70f201059._comment | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment new file mode 100644 index 00000000..ca112817 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment @@ -0,0 +1,49 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 4" + date="2019-06-04T00:38:58Z" + content=""" +[@spwhitton](spwhittonhttps://propellor.branchable.com/user/spwhitton/), Sorry I should've mentioned it before. I've already tried merging upstream changes using `git merge`, I'm unable to merge it due to different commit histories: + +``` +cygnus$ git remote -v +s g@git.rs:~/c/propellor.git (fetch) +s g@git.rs:~/c/propellor.git (push) +u git://propellor.branchable.com/propellor (fetch) +u git://propellor.branchable.com/propellor (push) + + +cygnus$ git tag -l | grep 5.8.0 +5.8.0 + +cygnus$ git merge 5.8.0 +fatal: refusing to merge unrelated histories +cygnus$ git merge u/master +fatal: refusing to merge unrelated histories +``` + +First commit in upstream repo: + +``` +cygnus$ git log --reverse u/master | head -n 5 +commit d9af8bac5eb7836a3c90e37e870fd73d30b841fd +Author: Joey Hess +Date: Sat Mar 29 23:10:52 2014 -0400 + + initial check-in +``` + +First commit in my repo: + +``` +cygnus$ git log --reverse s/master | head -n 5 +commit ff6173d6cd45e383da0f315bc80b52d486306cbc +Author: build +Date: Tue Nov 22 14:16:29 2016 -0700 + + distributed version of propellor + +``` +"""]] -- cgit v1.2.3 From 3b6f3db257cd4471324ecb98e056598dc4b9bd82 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Wed, 5 Jun 2019 15:08:02 +0000 Subject: Added a comment --- .../comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment new file mode 100644 index 00000000..2b169a57 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 5" + date="2019-06-05T15:08:02Z" + content=""" +You can pass `-X theirs --allow-unrelated-histories` or similar. +"""]] -- cgit v1.2.3 From 35bf7c3196e0b98a65388e4affc7f5819f09caaa Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Thu, 6 Jun 2019 03:00:44 +0000 Subject: Added a comment --- .../comment_6_c7f1e82b71c3317a25230e076eb0a330._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment new file mode 100644 index 00000000..eadab877 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 6" + date="2019-06-06T03:00:43Z" + content=""" +[@spwhitton](https://propellor.branchable.com/user/spwhitton/), Thank you very much. That worked! +"""]] -- cgit v1.2.3 From 23c5587e60cc1b3de6c74f94b0f924344ef93cec Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Thu, 6 Jun 2019 03:13:02 +0000 Subject: Added a comment --- ...ent_7_de411d55ffbd72c5a4182168dead6b29._comment | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment new file mode 100644 index 00000000..9f6afc6b --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment @@ -0,0 +1,46 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 7" + date="2019-06-06T03:13:02Z" + content=""" +Documenting it (in case there is another user who wishes to do the same): + +Add upstream repo and fetch tags: + +``` +$ cd ~/.propellor + +$ git remote add u git://propellor.branchable.com/propellor +$ git fetch u --tags +``` + +Look for the list releases: + +``` +$ git tag -l +0.1 +0.1.1 +0.1.2 +0.2.0 +0.2.1 +... +... +... +X.Y.Z +``` + +To merge release `X.Y.Z` into your master branch, do: + +``` +$ git merge -X theirs --allow-unrelated-histories X.Y.Z +``` + +Fix any conflicts and: + +``` +$ git commit +``` + +"""]] -- cgit v1.2.3 From 30c1e57ea90ca2e8cd607fc1ad9b78bc7bf6dee1 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 8 Jun 2019 14:27:07 +0000 Subject: --- doc/forum/WIP_adding_dhcp_records_to_libvirt.mdwn | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/forum/WIP_adding_dhcp_records_to_libvirt.mdwn diff --git a/doc/forum/WIP_adding_dhcp_records_to_libvirt.mdwn b/doc/forum/WIP_adding_dhcp_records_to_libvirt.mdwn new file mode 100644 index 00000000..118f01ab --- /dev/null +++ b/doc/forum/WIP_adding_dhcp_records_to_libvirt.mdwn @@ -0,0 +1,31 @@ +I'm working on adding static (predictable) dhcp records to libvirt guests (code at the end). It seems like I might need to either do the equivalent of +[[!format bash """ +virsh net-update default delete ip-dhcp-host "" --config --live || /bin/true +virsh net-update default add ip-dhcp-host "" --config --live +"""]] +or parse the xml output of "virsh net-dumpxml". Is there some simple lightweight xml parsing option? Last time I tried something like this was a decade ago using HXT.Arrow, which didn't really end well. + +[[!format haskell """ +staticDHCP :: Host -> IPAddr -> Maybe Network.Gateway -> Property UnixLike +staticDHCP h ip gw = property "assign ip to host via dhcp" $ do + mac <- liftIO $ macAddress + case mac of + Nothing -> errorMessage "no interface" + Just addr -> makeChange $ unlessM (updateIt addr) $ + errorMessage "failed to update network" + where + updateIt mac = boolSystem "virsh" [ Param "net-update" + , Param "default" + , Param "add-last" + , Param "ip-dhcp-host" + , Param $ "" + , Param "--config" + , Param "--live"] + ifaceToString (IPv6 ipstr) = ipstr + ifaceToString (IPv4 ipstr) = ipstr + macAddress = do + ifaces <- virshGetColumns ["domiflist", hostName h] + case ifaces of + [] -> return Nothing + (i:_) -> return $ Just $ Propellor.Base.last i +"""]] -- cgit v1.2.3 From fd4cd21388dc40d28af500902655976de137afd6 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sat, 8 Jun 2019 20:21:57 +0000 Subject: Added a comment --- .../comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment new file mode 100644 index 00000000..b1344a10 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 8" + date="2019-06-08T20:21:57Z" + content=""" +The `git://` protocol is unencrypted and unauthenticated and you're not verifying Joey's PGP signature on the tag that you merge, so this approach is dangerous. + +I would insert a `git verify-tag` step in there. You'd want to make a record of (and perhaps locally sign) Joey's PGP key. +"""]] -- cgit v1.2.3 From 9571648e940e9d84cef6986abe1b4a955afe5fdb Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Sat, 15 Jun 2019 16:04:22 +0000 Subject: Added a comment --- ...ent_9_49c03760f833632a50b88be792395a5f._comment | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment new file mode 100644 index 00000000..94d697fd --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 9" + date="2019-06-15T16:04:22Z" + content=""" +Thanks again [@spwhitton](https://propellor.branchable.com/user/spwhitton/). I've verified the tag with Joey's GPG keys. + +Documenting here: + +Get Joey's [GPG keys](https://joeyh.name/contact/) + +``` +gpg2 --recv-keys 'E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7' +``` + +Verify the release tag before merging it into your local repo: + +``` +cd ~/.propellor +git verify-tag X.Y.Z +``` + +"""]] -- cgit v1.2.3 From 71de611d01156824e2ca3a8fac28e383b4be3e46 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 1 Jun 2019 10:55:49 -0300 Subject: Libvirt.installed: install libvirt-daemon-system Several things recommend libvirt-daemon, but not for whatever reason libvirt-daemon-system. This means the libvirt-daemon is not started, which can cause virt-install to fail. Installing libvirt-daemon explicitly is probably overkill, but avoids problems in case the dependencies of libvirt-daemon-system change. --- src/Propellor/Property/Libvirt.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/Libvirt.hs b/src/Propellor/Property/Libvirt.hs index 4dad5f39..71f59d65 100644 --- a/src/Propellor/Property/Libvirt.hs +++ b/src/Propellor/Property/Libvirt.hs @@ -34,7 +34,7 @@ data DiskImageType = Raw -- TODO: | QCow2 -- | Install basic libvirt components installed :: Property DebianLike -installed = Apt.installed ["libvirt-clients", "virtinst"] +installed = Apt.installed ["libvirt-clients", "virtinst", "libvirt-daemon", "libvirt-daemon-system"] -- | Ensure that the default libvirt network is set to autostart, and start it. -- -- cgit v1.2.3 From 211f7d6815a92f188e19dd07ec8c6ec8823a60e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jun 2019 12:32:54 -0400 Subject: changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index d681637d..c263fc96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (5.8.1) UNRELEASED; urgency=medium + + * Libvirt.installed: install libvirt-daemon-system + Thanks, David Bremner + + -- Joey Hess Sat, 15 Jun 2019 12:32:37 -0400 + propellor (5.8.0) unstable; urgency=medium * Fix bug in File.containsShellSetting that replaced whole shell conffile -- cgit v1.2.3 From d6a49fcf62552db38930a59b8269cb14b4973be0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jun 2019 12:37:46 -0400 Subject: response --- .../comment_1_9feaf88f735f6571835502cc9e15524b._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/WIP_adding_dhcp_records_to_libvirt/comment_1_9feaf88f735f6571835502cc9e15524b._comment diff --git a/doc/forum/WIP_adding_dhcp_records_to_libvirt/comment_1_9feaf88f735f6571835502cc9e15524b._comment b/doc/forum/WIP_adding_dhcp_records_to_libvirt/comment_1_9feaf88f735f6571835502cc9e15524b._comment new file mode 100644 index 00000000..a7173577 --- /dev/null +++ b/doc/forum/WIP_adding_dhcp_records_to_libvirt/comment_1_9feaf88f735f6571835502cc9e15524b._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2019-06-15T16:35:46Z" + content=""" +The former seems easier than parsing the XML. + +I mean, aeson is quite good and easy to parse XML with, +but I prefer to keep propellor's haskell dependencies minimal +and so if you used aeson there would be a big question about merging the +result into propellor core. +"""]] -- cgit v1.2.3