Skip to content

Commit

Permalink
Update mailing list details. MEMBERS -> CONTACTS
Browse files Browse the repository at this point in the history
  • Loading branch information
ebullient committed Dec 14, 2023
1 parent 1d68e75 commit da91596
Show file tree
Hide file tree
Showing 16 changed files with 118 additions and 52 deletions.
1 change: 1 addition & 0 deletions .github/docker-build-pdf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ function to_pdf() {
-A ./.pandoc/afterBody.tex \
-d ./.pandoc/bylaws.yaml \
-M date-meta:"$(date +%B\ %d,\ %Y)" \
--metadata-file=CONTACTS.yaml \
-V footer-left:"${FOOTER}" \
-V github:"${URL}blob/${GIT_COMMIT}/" \
"$@"
Expand Down
51 changes: 49 additions & 2 deletions .pandoc/fix-links.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,43 @@
function Link(el)
local mailing_list

local function Meta(m)
mailing_list = m['mailing-list']
return m
end

local function replace_mailing_list(el)
local content = pandoc.utils.stringify(el.content)
if not mailing_list then
error("CFLUA: No mailing list metadata found")
end
if content == 'CONTACTS.yaml' then
return el
end

local mailing_list_name = string.match(content, "(.-) mailing list")
if not mailing_list_name then
warn("CFLUA: No mailing list found in " .. content)
return el
end

local mailing_list_value = mailing_list[mailing_list_name]
if not mailing_list_value then
warn("CFLUA: No mailing list value found for " .. mailing_list_name)
return el
end

local address = pandoc.utils.stringify(mailing_list_value)
local mailto_link = pandoc.Link(address, "mailto:" .. address)
print("CFLUA: Replaced '" .. content .. "' with " .. pandoc.utils.stringify(mailto_link))
el.content = {mailto_link}
return el
end

local function Link(el)
if string.match(el.target, "CONTACTS.yaml") then
el = replace_mailing_list(el)
end

if string.match(el.target, "http") then
return el
end
Expand All @@ -14,4 +53,12 @@ function Link(el)
el.target = modifiedTarget
end
return el
end
end

--------------------------------------------------------------------------------
-- The main function --
--------------------------------------------------------------------------------
return {
{ Meta = Meta },
{ Link = Link }
}
5 changes: 3 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ follows the [Commonhaus Foundation (CF) CoC][coc-policy].
## Contact information

- **Project-related Issues:** Each CF project will define a `CODE_OF_CONDUCT.md`. For issues related to a project, start there.
- **Foundation-wide Issues:** Issues related to the CF should be sent to `report@mailing-list` for [review][coc-response] by the [Commonhaus Foundation Council][cfc] (CFC).
- **Foundation-wide Issues:** Issues related to the CF should be sent to the [`report` mailing list][CONTACTS.yaml] for [review][coc-response] by the [Commonhaus Foundation Council][cfc] (CFC).
- The CFC will follow [CF CoC procedures][coc-reports] when handling CoC reports.
- Records will be kept in TODO-private-repository. Access to this repository is restricted to current CFC members.
- **Escalations:** [Escalations][coc-escalate] should be sent to `coc-escalation@mailing-list` for review by the [Code of Conduct Panel (COCP)][cocp].
- **Escalations:** [Escalations][coc-escalate] should be sent to the [`coc-escalation` mailing list][CONTACTS.yaml] for review by the [Code of Conduct Panel (COCP)][cocp].
- The [CoCP][cocp] will follow [CF CoC procedures][coc-reports] when handling CoC reports and escalations.
- Records will be kept in TODO-private-repository. Access to this repository is restricted to CoCP members.

Expand All @@ -25,3 +25,4 @@ To avoid duplication, please see the [CF CoC][coc-policy] for more information
[coc-escalate]: ./policies/code-of-conduct.md#escalate-an-issue
[cocp]: ./policies/code-of-conduct.md#code-of-conduct-panel "Code of Conduct Panel"
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
17 changes: 17 additions & 0 deletions CONTACTS.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
cf-council:
- TBD / ...
advisory-board:
- TBD / ...
cocp-panel:
- TBD / ...
- TBD / ...
- TBD / ...
mailing-list:
coc-escalation: [email protected]
coc-report: [email protected]
coi-report: [email protected]
council: [email protected]
ip: [email protected]
legal: [email protected]
report: [email protected]
trademarks: [email protected]
3 changes: 2 additions & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Organizational governance is described in detail in the [Bylaws][bylaws], which

The **CF Council (CFC)** is the governing body responsible for overarching decisions, financial allocations, and setting future plans. It consists of elected members who prioritize the interests of the CF community in their actions.

- **Concerns and Actions**: Members can voice concerns or propose actions by emailing `council@mailing-list` (TODO: or initiating a GitHub discussion, etc.).
- **Concerns and Actions**: Members can voice concerns or propose actions by emailing the [`council` mailing list][CONTACTS.yaml] (TODO: or initiating a GitHub discussion, etc.).

See [CF Council][cfc] for more details.

Expand Down Expand Up @@ -62,3 +62,4 @@ We welcome all forms of contribution, from code improvements to documentation an
[contrib]: ./CONTRIBUTING.md
[membership]: ./bylaws/cf-membership.md
[records]: ./bylaws/notice-records.md
[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
8 changes: 0 additions & 8 deletions MEMBERS.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions bylaws/cf-advisory-board.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ The Advisory Board does not have decision-making authority but plays a crucial r

- **Engagement**: The Advisory Board's engagement is pivotal in aligning the CF's strategic initiatives with industry needs, ensuring that the foundation remains relevant and responsive to the ecosystem it serves.

An up-to-date list of Advisory Board representatives will be maintained in the `advisory-board` [MEMBERS.yaml][] attribute.
An up-to-date list of Advisory Board representatives will be maintained in the `advisory-board` [CONTACTS.yaml][] attribute.

[MEMBERS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/MEMBERS.yaml
[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
15 changes: 7 additions & 8 deletions bylaws/cf-council.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ weight: 3

The Commonhaus Foundation Council (CFC) serves as the Board of Directors for the Commonhaus Foundation (CF). Governed by the legal requirements of the State of Florida and as defined in our Articles of Incorporation and [Bylaws][bylaws], the CFC is responsible for the strategic, governance, and fiduciary aspects of the Foundation.

- **Member Communication**: Concerns or proposals can be addressed to the CFC at `council@mailing-list` *(TBD: or initiating a GitHub discussion, etc.)*.
- **Member Communication**: Concerns or proposals can be addressed to the CFC at the [`council` mailing list][CONTACTS.yaml] *(TBD: or initiating a GitHub discussion, etc.)*.

- [Meetings, Participation, and Record Keeping](#meetings-participation-and-record-keeping)
- [Regular and Special Meetings](#regular-and-special-meetings)
Expand Down Expand Up @@ -51,7 +51,7 @@ Efficient participation and decision-making are essential for geographically dis

The CFC comprises elected members recognized for their contributions to the open-source community. As representatives of diverse organizations, CFC members are committed to prioritizing the interests of the CF community in their decision-making.

An up-to-date list of CFC members will be maintained in the `cf-council` [MEMBERS.yaml][] attribute.
An up-to-date list of CFC members will be maintained in the `cf-council` [CONTACTS.yaml][] attribute.

**Structure:** The CFC is composed of a minimum of 3 elected members: 1 [CFC Chairperson](#cfc-chairperson) and at least 2 members-at-large. One-third of the CFC members must be direct representatives of CF projects to ensure a balanced representation of project needs and perspectives.

Expand Down Expand Up @@ -118,12 +118,11 @@ The CFC may form committees with specific purposes that are authorized to make r

Certain critical actions (anything requiring a Supermajority vote) are reserved for the full CFC. Temporary or ad-hoc groups may be established for specific tasks, with the CFC retaining ultimate oversight and decision-making authority.


[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[bylaws]: ./README.md
[coc-reports]: ../policies/code-of-conduct.md#handling-reports-and-escalations
[coi-policy]: ../policies/conflict-of-interest.md
[MEMBERS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/MEMBERS.yaml
[bylaws]: ./README.md
[notice]: ./notice-records.md#notice
[records]: ./notice-records.md#record-keeping
[consensus]: ./decision-making.md#general-decision-making
[elections]: ./decision-making.md#elections
[elections]: ./decision-making.md#elections
[notice]: ./notice-records.md#notice
[records]: ./notice-records.md#record-keeping
3 changes: 2 additions & 1 deletion policies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ The CF Council (CFC) is responsible for reviewing and approving all policies. Th

Amendments or changes to Policies will follow the [amendment process][].

For questions or clarifications on these policies, please contact `legal@mailing-list`.
For questions or clarifications on these policies, please contact the [`legal` mailing list][CONTACTS.yaml].

[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[amendment process]: ../bylaws/amendments.md
22 changes: 12 additions & 10 deletions policies/code-of-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Welcome to the Code of Conduct (CoC) for the Commonhaus Foundation (CF). This do
- [Code of Conduct Panel](#code-of-conduct-panel)
- [Handling Reports and Escalations](#handling-reports-and-escalations)
- [Conflict of Interest](#conflict-of-interest)
- [Reports to `report@mailing-list`](#reports-to-reportmailing-list)
- [Reports to `coc-escalation@mailing-list`](#reports-to-coc-escalationmailing-list)
- [Reports to the CoC report mailing list](#reports-to-the-coc-report-mailing-list)
- [Reports to the CoC escalation mailing list](#reports-to-the-coc-escalation-mailing-list)
- **Contributor Covenant Code of Conduct**
- [Our Pledge](#our-pledge)
- [Our Standards](#our-standards)
Expand All @@ -28,7 +28,7 @@ Welcome to the Code of Conduct (CoC) for the Commonhaus Foundation (CF). This do
- [Permanent Ban](#permanent-ban)
- [Attribution](#attribution)

[MEMBERS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/MEMBERS.yaml
[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[cc-dm]: ../bylaws/decision-making.md

## Our Code of Conduct
Expand All @@ -41,6 +41,8 @@ The CF has adopted the [Contributor Covenant v2.1][v2.1] as its CoC (full text [
A CoC is meaningful only [when it is effectively enforced][moz-coc].
Having a unified CoC allows for consistent enforcement and better support across all CF projects.

CF Council members (CFC) and CF project leaders are [expected](#leadership-expectations) to respect and uphold the CoC for their areas of responsiblity. A [Code of Conduct Panel (CoCP)](#code-of-conduct-panel) provides an avenue for appeals or escalations, if necessary.

[moz-coc]: https://medium.com/mozilla-open-innovation/how-were-making-code-of-conduct-enforcement-real-and-scaling-it-3e382cf94415

### Member Expectations
Expand Down Expand Up @@ -75,7 +77,7 @@ This does not mean that decisions are set in stone. CF projects and the CFC are
### Report an issue

- Each CF project is free to implement enforcement of the CoC using processes appropriate for the size and scope of the project. CoC enforcement processes and contact methods must be defined in the projects' `CODE_OF_CONDUCT.md`.
- For CF repositories that do not specify their own `CODE_OF_CONDUCT.md`, send your report to `report@mailing-list`. The CFC will receive these reports.
- For CF repositories that do not specify their own the `CODE_OF_CONDUCT.md`, send your report to the [`report` mailing list][CONTACTS.yaml]. The CFC will receive these reports.

Confidentiality is of utmost importance. We also understand that the person reporting the issue (**reporter**) may not be the individual directly affected or harmed (**target**). In such cases, communication will primarily be with the reporter unless the target explicitly gives permission. Personal details of the reporter (and the target if they differ) will not be disclosed without permission.

Expand All @@ -97,7 +99,7 @@ We expect most reports to be handled by the processes put in place by a project

The CF maintains the CoCP to manage escalation when a reporter (a) believes that a report to a member project or the CFC has not been properly handled, or (b) does not feel comfortable reporting an issue through the standard process.

Email `coc-escalation@mailing-list` to escalate an issue to the CoCP. The CoCP will meet to review submitted reports as described in [CF CoC procedures](#reports-to-reportmailing-list).
Email the [`coc-escalation` mailing list][CONTACTS.yaml] to escalate an issue to the CoCP. The CoCP will meet to review submitted reports as described in [CF CoC procedures](#reports-to-the-coc-report-mailing-list).

### Code of Conduct Panel

Expand All @@ -106,7 +108,7 @@ The CoCP is a foundation-wide team composed of the CFC Chairperson and 4 elected
CoCP members serve for two year terms. CF contributors and members from the broader community can be nominated to the CoCP.
CoCP members should consider objectivity and diversity of experience and perspective when electing CoCP members.

Members of the CoCP will be documented in the `cocp-panel` [MEMBERS.yaml][] attribute.
Members of the CoCP will be documented in the `cocp-panel` [CONTACTS.yaml][] attribute.

## Handling Reports and Escalations

Expand All @@ -116,9 +118,9 @@ This section describes the process and roles for handling Code of Conduct (CoC)

Any member of the CFC or CoCP who is involved in the report must recuse themselves from the discussions.

### Reports to `report@mailing-list`
### Reports to the CoC report mailing list

All members of the CFC are subscribed to the `report@mailing-list` mailing list.
All members of the CFC are subscribed to the the [`report` mailing list][CONTACTS.yaml] mailing list.

We understand that the person reporting the issue (**reporter**) may not be the individual directly affected or harmed (**target**). In such cases, communication will primarily be with the reporter unless the target explicitly gives permission.

Expand All @@ -130,9 +132,9 @@ We understand that the person reporting the issue (**reporter**) may not be the
6. **Communication of Resolution:** The resolution is shared with the reporter or target. Feedback loops can continue until concerns have been adequately addressed. Absence of feedback within 7 days means resolution acceptance.
7. **Finalization:** The agreed resolution is implemented.

### Reports to `coc-escalation@mailing-list`
### Reports to the CoC Escalation mailing list

All members of the CoCP are subscribed to the `coc-escalation@mailing-list` mailing list.
All members of the CoCP are subscribed to the the [`coc-escalation` mailing list][CONTACTS.yaml] mailing list.

The CoCP will follow the same overall procedure as the CFC, with the following changes:

Expand Down
3 changes: 2 additions & 1 deletion policies/conflict-of-interest.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ All individuals will abstain from discussions or votes concerning their own comp

This policy will be reviewed periodically to ensure it remains relevant and effective. Amendments or changes to this policy will follow the [amendment process][].

For questions or clarifications on this policy, please contact `legal@mailing-list`.
For questions or clarifications on this policy, please contact the [`legal` mailing list][CONTACTS.yaml].

[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[amendment process]: ../bylaws/amendments.md
3 changes: 2 additions & 1 deletion policies/dissolution-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ Records of the dissolution process will be maintained for legal and historical p

This policy will be reviewed periodically to ensure it remains relevant and effective. Amendments or changes to this policy will follow the [amendment process][].

For questions or clarifications on this policy, please contact `legal@mailing-list`.
For questions or clarifications on this policy, please contact the [`legal` mailing list][CONTACTS.yaml].

[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[amendment process]: ../bylaws/amendments.md
[record-keeping]: ../bylaws/notice-records.md#record-keeping
11 changes: 6 additions & 5 deletions policies/ip-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ If the [IP Policy][] doesn't cater to your project's needs, request special perm

This policy will be reviewed periodically to ensure it remains relevant and effective. Amendments or changes to this policy will follow the [amendment process][].

For questions or clarifications on this policy, please contact `legal@mailing-list`.
For questions or clarifications on this policy, please contact the [`legal` mailing list][CONTACTS.yaml].

[CC BY 4.0]: http://creativecommons.org/licenses/by/4.0/ "Creative Commons Attribution 4.0 International License (CC BY 4.0)"
[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[DCO]: http://developercertificate.org/
[IP Policy]: ../policies/ip-policy.md
[MIT]: https://opensource.org/license/mit/ "The MIT License"
[amendment process]: ../bylaws/amendments.md
[cfc]: ../bylaws/cf-council.md "CF Council"
[standard website footer]: https://github.com/commonhaus/foundation-draft/blob/main/templates/website-footer.md "CF website footers"
[CC BY 4.0]: http://creativecommons.org/licenses/by/4.0/ "Creative Commons Attribution 4.0 International License (CC BY 4.0)"
[MIT]: https://opensource.org/license/mit/ "The MIT License"
[DCO]: http://developercertificate.org/
[code-copyright]: https://matija.suklje.name/how-and-why-to-properly-write-copyright-statements-in-your-code
[standard website footer]: https://github.com/commonhaus/foundation-draft/blob/main/templates/website-footer.md "CF website footers"
9 changes: 5 additions & 4 deletions policies/succession-plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ Further Reading:

This policy may undergo periodic reviews and updates to cater to the evolving needs of the CF and its projects. Project leaders and the community will be involved in and informed of any changes. Amendments or changes to this policy will follow the [amendment process][].

For questions or clarifications on this policy, please contact `legal@mailing-list`.
For questions or clarifications on this policy, please contact the [`legal` mailing list][CONTACTS.yaml].

[amendment process]: ../bylaws/amendments.md
[GOVERNANCE.md]: https://github.com/commonhaus/foundation-draft/blob/main/GOVERNANCE.md
[CONTACTS.yaml]: https://github.com/commonhaus/foundation-draft/blob/main/CONTACTS.yaml
[CONTRIB-TPL]: https://github.com/commonhaus/foundation-draft/blob/main/templates/CONTRIBUTING.md
[CONTRIBUTING.md]: https://github.com/commonhaus/foundation-draft/blob/main/CONTRIBUTING.md
[GOV-TPL]: https://github.com/commonhaus/foundation-draft/blob/main/templates/GOVERNANCE.md
[CONTRIB-TPL]: https://github.com/commonhaus/foundation-draft/blob/main/templates/CONTRIBUTING.md
[GOVERNANCE.md]: https://github.com/commonhaus/foundation-draft/blob/main/GOVERNANCE.md
[amendment process]: ../bylaws/amendments.md
Loading

0 comments on commit da91596

Please sign in to comment.