Merge pull request #46 from bouncepaw/0.14

1.0

.gitignore

@@ -1,2 +1,6 @@
 mycorrhiza
 hyphae/*.gog
+
+# go editors and IDEA folders
+.idea/
+.vscode/

Makefile

@@ -1,11 +1,8 @@
 run: build
 	./mycorrhiza metarrhiza
 
-auth_run: build
-	./mycorrhiza -auth-method fixed metarrhiza
-
-gemini_run: build
-	./mycorrhiza -gemini-cert-path "." metarrhiza
+config_run: build
+	./mycorrhiza -config-path "assets/config.ini" metarrhiza
 
 build:
 	go generate

README.md

@@ -1,10 +1,10 @@
-# 🍄 MycorrhizaWiki 0.13
+# 🍄 MycorrhizaWiki
 A wiki engine.
 
 [Main wiki](https://mycorrhiza.lesarbr.es)
 
 ## Building
-Also see [detailed instructions](https://mycorrhiza.lesarbr.es/page/deploy) on wiki.
+Also see [detailed instructions](https://mycorrhiza.lesarbr.es/hypha/deploy) on wiki.
 ```sh
 git clone --recurse-submodules https://github.com/bouncepaw/mycorrhiza
 cd mycorrhiza
@@ -21,26 +21,10 @@ mycorrhiza [OPTIONS...] WIKI_PATH
 WIKI_PATH must be a path to git repository which you want to be a wiki.
 
 Options:
-  -auth-method string
-        What auth method to use. Variants: "none", "fixed" (default "none")
-  -fixed-credentials-path string
-        Used when -auth-method=fixed. Path to file with user credentials. (default "mycocredentials.json")
-  -gemini-cert-path string
-        Directory where you store Gemini certificates. Leave empty if you don't want to use Gemini.
-  -header-links-hypha string
-        Optional hypha that overrides the header links
-  -home string
-        The home page (default "home")
-  -icon string
-        What to show in the navititle in the beginning, before the colon (default "🍄")
-  -name string
-        What is the name of your wiki (default "wiki")
-  -port string
-        Port to serve the wiki at (default "1737")
-  -url string
-        URL at which your wiki can be found. Used to generate feeds (default "http://0.0.0.0:$port")
-  -user-hypha string
-        Hypha which is a superhypha of all user pages (default "u")
+  -config-path string
+        Path to a configuration file. Leave empty if you don't want to use it.
+  -print-example-config
+        If true, print an example configuration file contents and exit. You can save the output to a file and base your own configuration on it.
 ```
 
 ## Features

assets/assets.qtpl

@@ -1,3 +1,11 @@
+{%- func HelpMessage() -%}
+Usage of %s:
+{%- endfunc -%}
+
+{%- func ExampleConfig() -%}
+{% cat "config.ini" %}
+{%- endfunc -%}
+
 {% func DefaultCSS() %}
 {% cat "default.css" %}
 {% endfunc %}