Skip to content

Commit 9ffef26

Browse files
authored
Merge pull request #43 from creativecommons/update-readme
reorganize, update, and complete README
2 parents def94e9 + 3d16db6 commit 9ffef26

File tree

1 file changed

+25
-36
lines changed

1 file changed

+25
-36
lines changed

README.md

+25-36
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,33 @@ website in a local Docker development environment.
1111
The CreativeCommons.org website is comprised of five components that are split
1212
into two categories:
1313
- dynamic component:
14-
- WordPress
14+
- WordPress (Vocabulary Theme)
1515
- static components:
1616
- Chooser
1717
- FAQ
18-
- Legal Tools (licenses and public domain dedications)
18+
- Legal Tools (licenses and public domain)
1919
- Platform Toolkit
2020

2121

22+
### Component repositories
23+
24+
Path label|Path|Component name|Component repositories
25+
----------|----|--------------|----------------------
26+
Chooser|`/choose`|Chooser|[chooser][gh-chooser]
27+
FAQ|`/faq`|FAQ|[faq][gh-faq]
28+
Licenses| `/licenses`|CC Legal Tools|[cc-legal-tools-app][gh-app], [cc-legal-tools-data][gh-data]
29+
Platform Toolkit|`/platform/toolkit`|Platform Toolkit|[mp][gh-mp]
30+
Public Domain|`/publicdomain`|CC Legal Tools|[cc-legal-tools-app][gh-app], [cc-legal-tools-data][gh-data]
31+
WordPress|`/` (default)|Vocabulary Theme|[vocabulary-theme][gh-vocab-theme]
32+
33+
[gh-chooser]: https://github.com/creativecommons/chooser
34+
[gh-faq]: https://github.com/creativecommons/faq
35+
[gh-app]: https://github.com/creativecommons/cc-legal-tools-app
36+
[gh-data]: https://github.com/creativecommons/cc-legal-tools-data
37+
[gh-mp]: https://github.com/creativecommons/mp
38+
[gh-vocab-theme]: https://github.com/creativecommons/vocabulary-theme
39+
40+
2241
## Code of conduct
2342

2443
[`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md):
@@ -47,8 +66,6 @@ containers:
4766
2. **index-phpmyadmin** - Database administration
4867
- [localhost:8003](http://localhost:8003/)
4968
3. **index-wpcli** - The command line interface for WordPress
50-
- This container does not have a persistent service. Expect the following
51-
message when you start the services: `index-wpcli exited with code 0`
5269
4. **index-web** - Web server (WordPress and static HTML components)
5370
- **[localhost:8080](http://localhost:8080/)**
5471
5. **index-wpdb** - Database server for WordPress
@@ -65,7 +82,7 @@ containers:
6582
├── faq
6683
└── mp
6784
```
68-
- [creativecommons/cc-legal-tools-data][gh-cc-legal-tools-data]
85+
- [creativecommons/cc-legal-tools-data][gh-data]
6986
- [creativecommons/chooser][gh-chooser]
7087
- [creativecommons/faq][gh-faq]
7188
- [creativecommons/mp][gh-mp]
@@ -87,11 +104,6 @@ containers:
87104
7. Optionally: manually activate/configure `wordfence` in the GUI for now.
88105
- **TODO:** automate in script
89106
90-
[gh-cc-legal-tools-data]: https://github.com/creativecommons/cc-legal-tools-data
91-
[gh-chooser]: https://github.com/creativecommons/chooser
92-
[gh-faq]: https://github.com/creativecommons/faq
93-
[gh-mp]: https://github.com/creativecommons/mp
94-
95107
96108
## Path URLs
97109
@@ -130,25 +142,6 @@ WordPress Admin|[Dev `/wp-admin`][d7]|[Stage `/wp-admin`][s7]|[Prod `/wp-admin`]
130142
[p7]: https://creativecommons.org/wp-admin/ "Prod WordPress Admin /wp-admin"
131143
132144
133-
## Component repositories
134-
135-
Path label|Path|Component name|Component repositories
136-
----------|----|--------------|----------------------
137-
Chooser|`/choose`|Chooser|[chooser][gh-chooser]
138-
FAQ|`/faq`|FAQ|[faq][gh-faq]
139-
Licenses| `/licenses`|CC Legal Tools|[cc-legal-tools-app][gh-app], [cc-legal-tools-data][gh-data]
140-
Platform Toolkit|`/platform/toolkit`|Platform Toolkit|[mp][gh-mp]
141-
Public Domain|`/publicdomain`|CC Legal Tools|[cc-legal-tools-app][gh-app], [cc-legal-tools-data][gh-data]
142-
WordPress|`/` (default)|Vocabulary Theme|[vocabulary-theme][gh-vocab-theme]
143-
144-
[gh-chooser]: https://github.com/creativecommons/chooser
145-
[gh-faq]: https://github.com/creativecommons/faq
146-
[gh-app]: https://github.com/creativecommons/cc-legal-tools-app
147-
[gh-data]: https://github.com/creativecommons/cc-legal-tools-data
148-
[gh-mp]: https://github.com/creativecommons/mp
149-
[gh-vocab-theme]: https://github.com/creativecommons/vocabulary-theme
150-
151-
152145
## Dev configuration
153146
154147
@@ -200,10 +193,10 @@ Also see [`config/composer/composer.json`](config/composer/composer.json).
200193
Also see [`config/composer/composer.json`](config/composer/composer.json).
201194
202195
203-
## Stage configuration
196+
## Stage and Prod configuration
204197
205-
The staging server is configured via Salt managed in the in
206-
[creativecommons/sre-salt-prime][sre-salt-prime] repository. The list below
198+
The staging server and production server are configured via Salt managed in the
199+
in [creativecommons/sre-salt-prime][sre-salt-prime] repository. The list below
207200
include the specifics (is non-exhaustive):
208201
- `pillars/`
209202
- [`3_HST/index/`][salt-hst-index]
@@ -220,10 +213,6 @@ include the specifics (is non-exhaustive):
220213
[salt-index-composer]: https://github.com/creativecommons/sre-salt-prime/blob/main/states/wordpress/files/index-composer.json
221214
[salt-wordpress-index]: https://github.com/creativecommons/sre-salt-prime/blob/main/states/wordpress/index.sls
222215
223-
## Prod configuration
224-
225-
_TODO_
226-
227216
228217
## Copying
229218

0 commit comments

Comments
 (0)