Skip to content

Commit 8743d23

Browse files
ericholscherericholscher
authored
Merge pull request #7940 from readthedocs/azure-to-aws
Change our sponsored hosting from Azure -> AWS.
2 parents 683734c + cdef384 commit 8743d23

File tree

6 files changed

+36
-34
lines changed

6 files changed

+36
-34
lines changed

‎docs/development/architecture.rst

+15-16
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ Diagram
88
::
99

1010
+-----------+
11-
| Azure |
1211
+-----| Load Bal |------+
1312
| +-----------+ |
1413
| |
15-
+---------+ +---------+
16-
+-------------+ | | | | +--------------+
17-
| |-----| Nginx | | Nginx |----| |
18-
| File | +---------+ +---------+ | File |
19-
| System | | | | System |
20-
+-------------+ +---------+ +--------+ +---------+ +--------------+
21-
| | |Gunicorn | | | |Gunicorn | | |
22-
| +---------|(Django) |--|Postgres|--|(Django) |--------+ |
23-
| +---------+ +--------+ +---------+ |
14+
+---------+ +---------+
15+
+-------------+ | | | | +--------------+
16+
| |-----| Nginx | | Nginx |----| |
17+
| File | +---------+ +---------+ | File |
18+
| System | | | | System |
19+
+-------------+ +---------+ +--------+ +---------+ +--------------+
20+
| | |Gunicorn | | | |Gunicorn | | |
21+
| +---------|(Django) |--|Postgres|--|(Django) |--------+ |
22+
| +---------+ +--------+ +---------+ |
2423
| | | |
2524
| | | |
2625
| -----------API------------ |
@@ -29,12 +28,12 @@ Diagram
2928
| +------------------+ |
3029
| | | |
3130
+---------------------| Build Server |-------------------+
32-
| |
33-
+------------------+
34-
35-
36-
37-
31+
| |
32+
+------------------+
33+
34+
35+
36+
3837

3938

4039

‎docs/development/standards.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ Celery is isolated from database
5151
Use NGINX as web server
5252
All the site is served via NGINX with the ability to change some configuration locally.
5353

54-
Azurite as Django storage backend
55-
All static and media files are served using Azurite --an emulator of Azure Blob Storage,
54+
MinIO as Django storage backend
55+
All static and media files are served using Minio --an emulator of S3,
5656
which is the one used in production.
5757

5858
Serve documentation via El Proxito

‎docs/sponsors.rst

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ supporting us.
99
Current sponsors
1010
----------------
1111

12-
* `Microsoft Azure`_ - They cover all of our hosting expenses every month. This is a pretty large sum of money, averaging around $3,000/mo, and we are really grateful to have them as a sponsor.
12+
* `AWS`_ - They cover all of our hosting expenses every month. This is a pretty large sum of money, averaging around $5,000/mo.
1313
* `Cloudflare`_ - Cloudflare is providing us with an enterprise plan of their SSL for SaaS Providers product that enables us to provide SSL certificates for custom domains.
14-
* You? (Email us at rev@readthedocs.org for more info)
14+
* You? (Email us at hello@readthedocs.org for more info)
1515

1616
Past sponsors
1717
-------------
1818

19+
* `Microsoft Azure`_
1920
* `Python Software Foundation`_
2021
* `Revsys`_
2122
* `Mozilla Web Dev`_
@@ -34,6 +35,7 @@ Past sponsors
3435
.. _Twilio: https://www.twilio.com/
3536
.. _Cloudflare: https://www.cloudflare.com/
3637
.. _Microsoft Azure: https://azure.microsoft.com/
38+
.. _AWS: https://aws.amazon.com/
3739

3840

3941
Sponsorship Information

‎media/images/sponsors/aws.png

1.73 KB
Loading

‎readthedocs/templates/base.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ <h4>{% trans 'Business Info' %}</h4>
257257

258258
<div class="sponsors">
259259
<a class="sponsor" href="https://azure.microsoft.com" rel="noopener" target="_blank">
260-
<img src="{% static 'images/sponsors/azure.png' %}" alt="Microsoft Azure" class="sponsor-image">
261-
<div class="sponsor-name">Microsoft Azure</div>
260+
<img src="{% static 'images/sponsors/aws.png' %}" alt="Amazon Web Services" class="sponsor-image">
261+
<div class="sponsor-name">AWS</div>
262262
<div class="sponsor-description">Cloud Computing</div>
263263
</a>
264264
<a class="sponsor" href="https://cloudflare.com" rel="noopener" target="_blank">

‎readthedocs/templates/homepage.html

+13-12
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,22 @@ <h2>{% trans "Technical documentation lives here" %}</h2>
5555

5656
<section>
5757
<div class="feature">
58-
<h3>Free docs hosting</h3>
58+
<h3>Free docs hosting for open source</h3>
5959
<p>
6060
{% blocktrans trimmed %}
61-
We will host your documentation for free forever.
62-
There are no tricks. We help tens of thousands of open source projects
63-
share their docs.
61+
We will host your documentation for free, forever.
62+
There are no tricks.
63+
We help over 100,000 open source projects share their docs,
64+
including a custom domain and theme.
6465
{% endblocktrans %}
6566
</p>
6667
</div>
6768
<div class="feature">
68-
<h3>Webhooks</h3>
69+
<h3>Always up to date</h3>
6970
<p>
7071
{% blocktrans trimmed %}
71-
Whenever you push code to your favorite version control system,
72-
whether that is Git, Mercurial, Bazaar, or Subversion, we will
72+
Whenever you push code to your favorite version control service,
73+
whether that is GitHub, BitBucket, or GitLab, we will
7374
automatically build your docs so your code and documentation are
7475
never out of sync.
7576
{% endblocktrans %}
@@ -80,10 +81,10 @@ <h3>Webhooks</h3>
8081

8182
<section>
8283
<div class="feature">
83-
<h3>Multiple formats</h3>
84+
<h3>Downloadable formats</h3>
8485
<p>
8586
{% blocktrans trimmed %}
86-
Of course we build and host your docs for the web, but they are
87+
We build and host your docs for the web, but they are
8788
also vieweable as PDFs, as single page HTML, and for eReaders.
8889
No additional configuration is required.
8990
{% endblocktrans %}
@@ -152,17 +153,17 @@ <h2>{% trans "Read the Docs is funded by the community" %}</h2>
152153

153154
<p>
154155
{% blocktrans trimmed %}
155-
Read the Docs is <strong>community supported</strong>.
156+
Read the Docs is open source and community supported.
156157
It depends on users like you to contribute to development, support, and operations.
157158
You can learn more about how to <a href="https://docs.readthedocs.io/page/contribute.html">contribute</a> in our docs.
158-
Thanks so much to our wonderful <a href="https://docs.readthedocs.io/page/team.html">community team</a> who helps us run the site.
159+
Thanks so much to our wonderful <a href="https://docs.readthedocs.io/page/team.html">team</a> who helps us run the site.
159160
Read the Docs wouldn't be possible without them.
160161
{% endblocktrans %}
161162
</p>
162163

163164
<p>
164165
{% blocktrans trimmed %}
165-
Hosting for the project is graciously provided by <a href="https://azure.microsoft.com/">Microsoft Azure</a>.
166+
Hosting for the project is graciously provided by <a href="https://aws.amazon.com/">AWS</a> and <a href="https://cloudflare.com/">Cloudflare</a>.
166167
{% endblocktrans %}
167168
</p>
168169
</section>

0 commit comments

Comments
 (0)