diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-27 19:21:20 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-27 19:21:20 +0400 |
| commit | 03d0c5abfba6a334783b46a09d865dba6fde6586 (patch) | |
| tree | d339c45678a7fb062075c537724b9b71d8944955 /installation | |
| parent | 1ab4ab8d38687634735e1415f395b072718ab1ab (diff) | |
| parent | e93ae96e1323fae954c2ce482cbb1df9ed9441c6 (diff) | |
| download | pleroma-03d0c5abfba6a334783b46a09d865dba6fde6586.tar.gz pleroma-03d0c5abfba6a334783b46a09d865dba6fde6586.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into tusooa/extract-fix
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/nsfw-api.service | 15 | ||||
| -rwxr-xr-x | installation/pleroma-mongooseim.cfg | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/installation/nsfw-api.service b/installation/nsfw-api.service new file mode 100644 index 000000000..ec629df67 --- /dev/null +++ b/installation/nsfw-api.service @@ -0,0 +1,15 @@ +[Unit] +Description=NSFW API +After=docker.service +Requires=docker.service + +[Service] +TimeoutStartSec=0 +Restart=always +ExecStartPre=-/usr/bin/docker stop %n +ExecStartPre=-/usr/bin/docker rm %n +ExecStartPre=/usr/bin/docker pull eugencepoi/nsfw_api:latest +ExecStart=/usr/bin/docker run --rm -p 127.0.0.1:5000:5000/tcp --env PORT=5000 --name %n eugencepoi/nsfw_api:latest + +[Install] +WantedBy=multi-user.target diff --git a/installation/pleroma-mongooseim.cfg b/installation/pleroma-mongooseim.cfg index 3ecba5641..6b568fd03 100755 --- a/installation/pleroma-mongooseim.cfg +++ b/installation/pleroma-mongooseim.cfg @@ -204,7 +204,7 @@ ]} ]}, - %% Following HTTP API is deprected, the new one abouve should be used instead + %% Following HTTP API is deprecated, the new one above should be used instead { {5288, "127.0.0.1"} , ejabberd_cowboy, [ {num_acceptors, 10}, @@ -824,7 +824,7 @@ %% Enable archivization for private messages (default) % {pm, [ - %% Top-level options can be overriden here if needed, for example: + %% Top-level options can be overridden here if needed, for example: % {async_writer, false} % ]}, @@ -834,7 +834,7 @@ %% % {muc, [ % {host, "muc.@HOST@"} - %% As with pm, top-level options can be overriden for MUC archive + %% As with pm, top-level options can be overridden for MUC archive % ]}, % %% Do not use a <stanza-id/> element (by default stanzaid is used) |