summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-07clean up after mergeJoey Hess
2016-03-07Merge branch 'master' into joeyconfigJoey Hess
2016-03-07privdata/relocateJoey Hess
better than symlinks because this way no conflict can ever occur and, commit from hook
2016-03-07add back after merging masterJoey Hess
2016-03-07Merge branch 'joeyconfig'Joey Hess
2016-03-07got tired of needing to cherry-pick changes into joeyconfig, wrote a hookJoey Hess
So, when I merge some branch into joeyconfig, config.hs will automatically be updated to point to joeyconfig.hs again, even if the merge changes it. And, when I merge joeyconfig into master, config.hs will be pointed back to config-simple.hs This may also be useful for others who maintain a branch like joeyconfig.
2016-03-07remove debian/rules guard in joeyconfig branchJoey Hess
Not needed any longer as I don't build the debs and thus can't accidentially build them from this branch.
2016-03-07updateJoey Hess
2016-03-07Firewall: add NatDestination to RulesFélix Sipma
(cherry picked from commit df40046fd65bc07eced41adb73c7e227d2b54cd1)
2016-03-07Ssh: change type of listenPort from Int to Port (API change)Félix Sipma
(cherry picked from commit 0207c5ab585f41877c1b9f9674a25941cffd2ac7)
2016-03-07add fromPort functionFélix Sipma
(cherry picked from commit c3a23f89092d1ef8367c37ab8993ea7031124f4b)
2016-03-07Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07removedmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07Merge branch 'joeyconfig'Joey Hess
2016-03-07changelogJoey Hess
2016-03-07improve filtering of interface filesJoey Hess
2016-03-07Network: escape interfaceDFile namesFélix Sipma
(cherry picked from commit 125135ea5d42d623346a385faf7ed404f8878891)
2016-03-06Merge branch 'joeyconfig'Joey Hess
2016-03-06updateJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06build with older ghcJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06Force ssh, scp, and git commands to be run in the foreground.Joey Hess
Before, they could run in the background if another process was running, and so their output wouldn't immediately be visible. With this change, the concurrent-output layer is not used for these interactive commands.
2016-03-06refactorJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06Merge branch 'joeyconfig'Joey Hess
2016-03-06responseJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06eek, nasty debug left inJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06propellor spinJoey Hess
2016-03-06stop using --continue SimpleRun for spinJoey Hess
When spinning a remote host, we do want to rebuild propellor on it, and this use of --continue that did a rebuild was different from all the other uses of --continue that avoided a rebuild. This fixes a build loop involving that special case. When --continue SimpleRun ran a rebuild, it re-execed propellor with --continue SimpleRun, and so would rebuild again, and re-exec again if the binary kept changing. Backwards compatability should be ok; old versions of propellor, when run with --serialized SimpleRun by the new version, do a buildFirst, followed by another (redundant) buildFirst, and then run. The one redundant buildFirst is not a problem in the upgrade scenario. (Unfortunately, I can't rename SimpleRun to something nicer despite only spin using it; backwards compatability does prevent that.)
2016-03-06refactor and propigate failure after re-running propellorJoey Hess
2016-03-06Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-06Merge branch 'joeyconfig'Joey Hess
2016-03-06commentJoey Hess
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-22 19:46:45 +0000