wip: resolution 047

Fixed slight formatting issues, which caused the resolution
to render incorrectly.

docs/federation/resolutions/draft/046.md

@@ -0,0 +1,32 @@
+---
+title: "Resolution 046: Restore servers.coop as a Coop Cloud project"
+---
+
+- Topic: Restore servers.coop as a Coop Cloud project
+- Date: TBD
+- Deadline: 2 weeks after voting starts
+- Size: medium
+
+### History
+
+[servers.coop](https://servers.coop) was launched as a project of Coop Cloud, intended to cooperatise lower down the stack than the abra toolshed. Similarly to how abra gives small cooperatives the tools to easily and collaboratively deploy services on a cloud, servers.coop is meant to support small cooperatives in deploying VPSs on hardware owned or managed by them.
+
+The project was left on the backburner for some years. Recently, we were motivated by rising data center costs and concerns about digital sovereignty to start working on the project again. A working group of four-ish people from the Coop Cloud community is currently working on defining and deploying an MVP.
+
+Servers.coop goals are closely aligned with those of Coop Cloud as a whole, but its usecases and userbase may end up diverging from those of abra. In the long term, servers.coop ought to become an independent collective, with its own governance, membership, budget, and infrastructure - similarly to how Coop Cloud grew from an Autonomic project into a distinct federation. In the short term, servers.coop needs the support of the Coop Cloud federation.
+
+### Proposal
+
+Formally, we treat servers.coop as a project of the Coop cloud federation.
+
+This grants the servers.coop project access to Coop Cloud's resources. For instance:
+
+- Coop Cloud server infrastructure can be used to organize and manage the project, including:
+   - conferencing or notetaking services provided by members for Coop Cloud use
+   - git.coopcloud.tech
+   - docs.coopcloud.tech
+- Grants written on behalf of Coop Cloud can include servers.coop in their goals and budget.
+- Coop Cloud federation members can propose and vote on resolutions regarding servers.coop governance, infrastructure, and budget.
+- Coop Cloud budget can be allocated to servers.coop goals, through resolutions.
+
+This support is intended to be temporary. Over the course of several years, the group working on/with servers.coop ought to move its resources onto dedicated instances and establish its own structure of governance and financing. When this happens, a new resolution should be passed to formally establish the new collective and change how Coop Cloud participates in the project.

docs/federation/resolutions/draft/047.md

@@ -0,0 +1,40 @@
+---
+title: "Resolution 047: Moratorium on LLM use and discussion"
+---
+
+- Topic: Moratorium on LLM use and discussion
+- Date: TBD
+- Deadline: 2 weeks after voting starts
+- Size: medium
+
+### History
+
+Discussion about LLM use or ban have been appearing on the Federation's
+Matrix rooms.  Also git.coopcloud.tech has been receiving LLM-assisted
+pull requests on recipes.
+
+Members' and contributors' stances around LLM use are split, and there
+are valid fears of having a split because of it.
+
+Federation members 3wc, ammar and maren have been following these
+threads and preparing a process to allow us to reach a consensus around
+an AI policy for the Coopcloud Federation.
+
+The process has been proposed and collective steps towards following it
+are taking place. Any discussion outside this process only contributes
+to draining folks' energy.
+
+### Proposal
+
+Self-impose a moratorium on LLM discussion on Federation's Matrix rooms
+and Git issues, to direct energies towards the process of establishing
+a consensus and an AI policy.
+
+LLM-assisted pull requests on more complex tools like `abra` are also
+within the moratorium, and will be put on hold until the AI policy is
+stablished.
+
+As for LLM-assisted pull requests, they should be clearly marked as
+such, and within each recipe maintainers' purview to accept or reject
+them.  This is because recipes with maintainers already have human
+review before merging.