aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-09-12 11:52:20 +1000
committerBen Sturmfels <ben@sturm.com.au>2021-09-12 11:52:20 +1000
commitf9b978592f8a2f7dae666afdb3456cfb36bf2557 (patch)
tree31a74b56817075f716143e4707feda667c3a74c2
parent120f144f0eb014e694a584a627c8b17856da5b51 (diff)
downloadmediagoblin-f9b978592f8a2f7dae666afdb3456cfb36bf2557.tar.lz
mediagoblin-f9b978592f8a2f7dae666afdb3456cfb36bf2557.tar.xz
mediagoblin-f9b978592f8a2f7dae666afdb3456cfb36bf2557.zip
Update Guix todos.
-rw-r--r--docs/source/siteadmin/deploying.rst14
-rw-r--r--guix-env.scm12
2 files changed, 12 insertions, 14 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 5520ba30..8a8c19ac 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -64,9 +64,9 @@ MediaGoblin has the following core dependencies:
- `virtualenv <http://www.virtualenv.org/>`_
- `Node.js <https://nodejs.org>`_
-These instructions have been tested on Debian 11, CentOS 8 and
-Fedora 33. These instructions should approximately translate to recent
-Debian derivatives such as Ubuntu 18.04 and Trisquel 8, and to relatives of
+These instructions have been tested on Debian 11 and Fedora 33. These
+instructions should approximately translate to recent Debian
+derivatives such as Ubuntu 18.04 and Trisquel 8, and to relatives of
Fedora such as CentOS 8.
Issue the following commands:
@@ -343,11 +343,6 @@ type ``exit`` or ``Ctrl-d``.
Deploy MediaGoblin
------------------
-The configuration described below is sufficient for development and
-smaller deployments. However, for larger production deployments with
-larger processing requirements, see the
-":doc:`production-deployments`" documentation.
-
.. _webserver-config:
Nginx as a reverse-proxy
@@ -619,6 +614,9 @@ This configuration supports upload of images only, but MediaGoblin
also supports other types of media, such as audio, video, PDFs and 3D
models. For details, see ":doc:`media-types`".
+See ":doc:`production-deployments`" for more information and other
+issues you may want to consider.
+
For other settings and configuration options, see
":doc:`configuration`".
diff --git a/guix-env.scm b/guix-env.scm
index 239205f1..d8f1c33e 100644
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -27,19 +27,17 @@
;;;
;;; WORK IN PROGRESS - JOBS TO DO:
;;;
-;;; 1. Refine and submit the below upgraded python-wtforms 2.3.3 to Guix.
-;;;
-;;; 2. Add ("opus" ,opus) to the libsndfile propagated inputs. This change is
+;;; 1. Add ("opus" ,opus) to the libsndfile propagated inputs. This change is
;;; waiting in core-updates (March 2021).
;;;
-;;; 3. Renable the tests in Guix's python-soundfile once OGG support is
+;;; 2. Renable the tests in Guix's python-soundfile once OGG support is
;;; available from libsndfile.
;;;
-;;; 4. Don't have NPM in this environment yet. Possibly rewrite MediaGoblin's
+;;; 3. Don't have NPM in this environment yet. Possibly rewrite MediaGoblin's
;;; JavaScript code not to use jQuery. Possibly improve the
;;; no-bundled-JavaScript video/audio playing experience.
;;;
-;;; 5. Package MediaGoblin itself as a Guix service. Look at adding a PostgreSQL
+;;; 4. Package MediaGoblin itself as a Guix service. Look at adding a PostgreSQL
;;; database instead of sqlite3.
;;;
;;; ========================================
@@ -305,3 +303,5 @@ available in Django, but is a standalone package.")
(description "MediaGoblin is a web application for publishing all kinds of
media.")
(license agpl3+)))
+
+mediagoblin