Skip to content

Change our sponsored hosting from Azure -> AWS. #7940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 23, 2021
Merged

Change our sponsored hosting from Azure -> AWS. #7940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f18968b
Change our sponsored hosting from Azure -> AWS.
ericholscher Feb 22, 2021
9a8fa87
Credit CF a bit more
ericholscher Feb 22, 2021
d4f6c2b
A bit more cleanup
ericholscher Feb 22, 2021
cdef384
Update landing page more
ericholscher Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions docs/development/architecture.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@ Diagram
::

+-----------+
| Azure |
+-----| Load Bal |------+
| +-----------+ |
| |
+---------+ +---------+
+-------------+ | | | | +--------------+
| |-----| Nginx | | Nginx |----| |
| File | +---------+ +---------+ | File |
| System | | | | System |
+-------------+ +---------+ +--------+ +---------+ +--------------+
| | |Gunicorn | | | |Gunicorn | | |
| +---------|(Django) |--|Postgres|--|(Django) |--------+ |
| +---------+ +--------+ +---------+ |
+---------+ +---------+
+-------------+ | | | | +--------------+
| |-----| Nginx | | Nginx |----| |
| File | +---------+ +---------+ | File |
| System | | | | System |
Comment on lines +17 to +18
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could update this to say S3 / Blob Storage / Cloud Storage now, since we don't serve files from file system anymore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I just didn't want to redo the whole diagram :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We definitely need to do a nicer version of this at some point, but not today! :)

+-------------+ +---------+ +--------+ +---------+ +--------------+
| | |Gunicorn | | | |Gunicorn | | |
| +---------|(Django) |--|Postgres|--|(Django) |--------+ |
| +---------+ +--------+ +---------+ |
| | | |
| | | |
| -----------API------------ |
Expand All @@ -29,12 +28,12 @@ Diagram
| +------------------+ |
| | | |
+---------------------| Build Server |-------------------+
| |
+------------------+
| |
+------------------+







Expand Down
4 changes: 2 additions & 2 deletions docs/development/standards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Celery is isolated from database
Use NGINX as web server
All the site is served via NGINX with the ability to change some configuration locally.

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

Serve documentation via El Proxito
Expand Down
6 changes: 4 additions & 2 deletions docs/sponsors.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ supporting us.
Current sponsors
----------------

* `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.
* `AWS`_ - They cover all of our hosting expenses every month. This is a pretty large sum of money, averaging around $5,000/mo.
* `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.
* You? (Email us at rev@readthedocs.org for more info)
* You? (Email us at hello@readthedocs.org for more info)

Past sponsors
-------------

* `Microsoft Azure`_
* `Python Software Foundation`_
* `Revsys`_
* `Mozilla Web Dev`_
Expand All @@ -34,6 +35,7 @@ Past sponsors
.. _Twilio: https://www.twilio.com/
.. _Cloudflare: https://www.cloudflare.com/
.. _Microsoft Azure: https://azure.microsoft.com/
.. _AWS: https://aws.amazon.com/


Sponsorship Information
Expand Down
Binary file added media/images/sponsors/aws.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions readthedocs/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ <h4>{% trans 'Business Info' %}</h4>

<div class="sponsors">
<a class="sponsor" href="https://azure.microsoft.com" rel="noopener" target="_blank">
<img src="{% static 'images/sponsors/azure.png' %}" alt="Microsoft Azure" class="sponsor-image">
<div class="sponsor-name">Microsoft Azure</div>
<img src="{% static 'images/sponsors/aws.png' %}" alt="Amazon Web Services" class="sponsor-image">
<div class="sponsor-name">AWS</div>
<div class="sponsor-description">Cloud Computing</div>
</a>
<a class="sponsor" href="https://cloudflare.com" rel="noopener" target="_blank">
Expand Down
25 changes: 13 additions & 12 deletions readthedocs/templates/homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,22 @@ <h2>{% trans "Technical documentation lives here" %}</h2>

<section>
<div class="feature">
<h3>Free docs hosting</h3>
<h3>Free docs hosting for open source</h3>
<p>
{% blocktrans trimmed %}
We will host your documentation for free forever.
There are no tricks. We help tens of thousands of open source projects
share their docs.
We will host your documentation for free, forever.
There are no tricks.
We help over 100,000 open source projects share their docs,
including a custom domain and theme.
{% endblocktrans %}
</p>
</div>
<div class="feature">
<h3>Webhooks</h3>
<h3>Always up to date</h3>
<p>
{% blocktrans trimmed %}
Whenever you push code to your favorite version control system,
whether that is Git, Mercurial, Bazaar, or Subversion, we will
Whenever you push code to your favorite version control service,
whether that is GitHub, BitBucket, or GitLab, we will
automatically build your docs so your code and documentation are
never out of sync.
{% endblocktrans %}
Expand All @@ -80,10 +81,10 @@ <h3>Webhooks</h3>

<section>
<div class="feature">
<h3>Multiple formats</h3>
<h3>Downloadable formats</h3>
<p>
{% blocktrans trimmed %}
Of course we build and host your docs for the web, but they are
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Of course" 😄

We build and host your docs for the web, but they are
also vieweable as PDFs, as single page HTML, and for eReaders.
No additional configuration is required.
{% endblocktrans %}
Expand Down Expand Up @@ -152,17 +153,17 @@ <h2>{% trans "Read the Docs is funded by the community" %}</h2>

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

<p>
{% blocktrans trimmed %}
Hosting for the project is graciously provided by <a href="https://azure.microsoft.com/">Microsoft Azure</a>.
Hosting for the project is graciously provided by <a href="https://aws.amazon.com/">AWS</a> and <a href="https://cloudflare.com/">Cloudflare</a>.
{% endblocktrans %}
</p>
</section>
Expand Down