Commit Graph

1053 Commits

Author SHA1 Message Date
Sandro
4fba4ceab7
Merge pull request #215407 from aopom/onlyoffice-mergeable-execstartpre
nixos/onlyoffice: allow ExecStartPre additions
2023-02-17 13:37:39 +01:00
Sandro
b2cf9511b3
Merge pull request #211547 from yater/patch-3 2023-02-14 22:32:47 +01:00
Mikael Voss
507c66f5b1
pleroma-fe: Rename to akkoma-fe 2023-02-14 20:05:08 +01:00
Moritz 'e1mo' Fromm
e8b59a1e2e
nixos/dokuwiki: remove last reference to aclUse
This was overlooked in #209299, but will throw a trace when building a
system even when the setting was not set.
2023-02-11 11:12:51 +01:00
Sandro
9ee0410a57
Merge pull request #214702 from Tom-Hubrecht/onlyoffice 2023-02-10 23:07:32 +01:00
Tom Hubrecht
405984ac13 nixos/onlyoffice: Fix initial permissions for the documentserver data 2023-02-10 19:16:19 +01:00
ppom
5a1ba62841 onlyoffice: allow ExecStartPre additions 2023-02-09 00:56:08 +01:00
pennae
bf4c0c1900 nixos/*: remove trailing period in mkEnableOptions
those are added by mkEnableOption, and .. is replaced to … by markdown
processing.
2023-02-08 15:23:34 +01:00
pennae
5b6dcece88
Merge pull request #212684 from pennae/nixos-render-docs
nixos-render-docs: init, use for some manual rendering to docbook
2023-01-30 19:26:07 +01:00
Colin Arnott
64f3a304db
nixos/wordpress: ensure default sites includes a theme 2023-01-28 10:31:56 +00:00
pennae
0a6e6cf7e6 nixos/manual: render module chapters with nixos-render-docs
this converts meta.doc into an md pointer, not an xml pointer. since we
no longer need xml for manual chapters we can also remove support for
manual chapters from md-to-db.sh

since pandoc converts smart quotes to docbook quote elements and our
nixos-render-docs does not we lose this distinction in the rendered
output. that's probably not that bad, our stylesheet didn't make use of
this anyway (and pre-23.05 versions of the chapters didn't use quote
elements either).

also updates the nixpkgs manual to clarify that option docs support all
extensions (although it doesn't support headings at all, so heading
anchors don't work by extension).
2023-01-27 20:07:34 +01:00
Jonas Heinrich
748c2b416c
nixos/wordpress: fix minor syntax error 2023-01-27 16:35:46 +01:00
Colin Arnott
66e0e5ad74
nixos/wordpress: plugins and themes as attrs
In an effort to better encode version strings and use descriptive pnames
that do not conflict with top level pkgs, we currently use
wordpress-${type}-${pname} for pname. This is good for the nix store,
but when we synthesize the wordpress derivation in our module, we reuse
this pname for the output directory.

Internally wordpress can handle this fine, since plugins must register
via php, not directory. Unfortunately, many plugins like civicrm and
wpforms-lite are designed to rely upon the name of their install
directory for homing or discovery.

As such, we should follow both the upstream convention and
services.nextcloud.extraApps and use an attribute set for these options.
This allows us to not have to deal with the implementation details of
plugins and themes, which differ from official and third party, but also
give users the option to override the install location. The only issue
is that it breaks the current api.
2023-01-27 15:24:19 +00:00
yater
3e1fdaf2e5 nixos/nextcloud: fix typo in option description
an option services.nextcloud.nginx.enableImagemagick does not exist.
2023-01-26 03:17:22 +01:00
Sandro
17631ae82d
Merge pull request #208712 from mattmelling/cloudlog
cloudlog: init at 2.3
2023-01-24 02:52:36 +01:00
Matt Melling
c281dd3e05
nixos/cloudlog: init 2023-01-23 22:41:07 +00:00
Sandro
9cf61a285c
Merge pull request #206746 from georgyo/mastodon-secretenv 2023-01-23 23:07:57 +01:00
Naïm Favier
363158603a nixos: fix backticks in Markdown descriptions 2023-01-21 18:08:38 +01:00
Ryan Lahfa
eb6d457115
Merge pull request #209246 from e1mo/dokuwiki/package-overriding
dokuwiki: Combine mechanism for plugins and templates
2023-01-18 00:51:18 +01:00
Jonas Heinrich
e8731b8778
Merge pull request #210701 from onny/wordpress-settings
nixos/wordpress: add settings option
2023-01-17 19:38:17 +01:00
Maximilian Bosch
91054ce6ce
Merge pull request #207748 from blargg/wiki-js
nixos/wiki-js: Add git and openssh to the wiki-js service path to enable git backups.
2023-01-17 08:35:58 +01:00
Tom Jankauski
eef1f70919 nixos/wiki-js: Add git and openssh to enable git backups. 2023-01-16 16:04:40 -08:00
Jonas Heinrich
c51dd42311 nixos/wordpress: add settings option 2023-01-16 14:06:10 +01:00
Felix Buehler
fb9e8b9bd4 nixos/photoprism: init module 2023-01-15 18:02:43 +01:00
George Shammas
fef1559b05 nixos/mastodon: Add the ability to pass environment files 2023-01-15 00:18:40 -05:00
pennae
d6e464b4c5
Merge pull request #208983 from pennae/nixos-manual-md
nixos/manual: convert module chapters to markdown
2023-01-13 13:29:01 +01:00
Sandro
32eceb420a
Merge pull request #209927 from thanegill/patch-4 2023-01-11 02:47:07 +01:00
Thane Gill
f851fbc19f
changedetection-io: remove podman.defaultNetwork.dnsname.enable 2023-01-11 00:32:59 +01:00
pennae
53fc887582 nixos/manual: move "edit the MD file" comments to generated XML 2023-01-10 12:34:37 +01:00
pennae
b15f4d0f97 nixos/akkoma: auto-generate module chapter from MD 2023-01-10 10:47:14 +01:00
pennae
bf92eaebe4 nixos/manual: generate module chapters with md-to-db.sh 2023-01-10 10:32:00 +01:00
pennae
dc7788efb8 nixos/manual: regenerate chapter xml files
apparently pandoc has changed behavior over the past releases, so the
files are no longer in sync. occasionally this requires edits
to the markdown source to not remove an anchor that was there
before (albeit wth a very questionable id), or where things were simply
being misrendered due to syntax errors.
2023-01-10 10:31:59 +01:00
pennae
23ea73b416 nixos/manual: enable smart quotes for all MD chapters 2023-01-10 10:31:59 +01:00
pennae
1bb00a9c12 nixos/plausible: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
42ea3f2699 nixos/nextcloud: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
66fdc39d80 nixos/matomo: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
760eaa3c94 nixos/keycloak: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
b5990a47e0 nixos/jitsi-meet: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
1be48def96 nixos/grocy: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
7318430f92 nixos/discourse: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
14cc405a69 nixos/manual: inline callout lists
we only have three uses at the moment, all of them in code blocks where
they could just as well (or maybe better) be comments. markdown can't do
callouts without another pandoc filter, so we'll turn them into comments
instead.

synapse would've benefited from inline links, but referencing an
external numbered list as plain text (instead of clickable links, like
callout lists had) seems even worse than putting urls into comments as
plain text.
2023-01-10 10:31:54 +01:00
pennae
25ec23b9aa nixos/manual: strip un-MD-able tags
productname, application, acronym, guilabel, and guibutton were so far
not rendered specially and can go away completely.

replaceable does render differently, but since it was only used twice
and in places where the intent should be clear without the extra markup
it can go as well.
2023-01-10 10:31:53 +01:00
pennae
d6fb4b0738 nixos/manual: replace <quote> with quotes
pandoc will turn them back into <quote> elements once we turn smart
quotes on (which we will not do at the start to keep diffs small).
2023-01-10 10:31:53 +01:00
pennae
21c0c631bc nixos/manual: normalize <function> -> <literal>
use <literal> instead since markdown will have them as inline code blocks.
2023-01-10 10:31:53 +01:00
pennae
22144ba269 nixos/manual: normalize <package> -> <literal>
markdown can only do <literal>, so normalize to that. without
auto-linking to a package index the distinction is not very useful anyway.
2023-01-10 10:31:52 +01:00
pennae
0715ecf936 nixos/manual: normalize <programlisting>
makes sure that program listing tags are separated from their contents
by exactly a newline character. this makes the markdown translation
easier to verify (since no new newlines need to be inserted), and
there's no rendering difference anyway.
2023-01-10 10:31:52 +01:00
pennae
6930425922 nixos/manual: normalize <literal><link> -> <link><literal>
MD can only do the latter, so change them all over now to keeps diffs reviewable.

this also includes <literal><xref> -> <xref> where options are referenced since
the reference will implicitly add an inner literal tag.
2023-01-10 10:31:52 +01:00
pennae
80a78f2e1e nixos/manual: remove links from program listings
markdown cannot represent those links. remove them all now instead of in
each chapter conversion to keep the diff for each chapter small and more
understandable.
2023-01-10 10:31:52 +01:00
Anderson Torres
593d558f05
Merge pull request #208196 from s1341/init_kasmweb
kasmweb: init at 1.12.0
2023-01-09 20:28:10 -03:00
Sandro
42094ae7fc
Merge pull request #209515 from SuperSandro2000/mastodon-dupe 2023-01-09 21:57:51 +01:00