mirror of
https://github.com/journeyman-cc/smeagol.git
synced 2026-04-12 18:05:06 +00:00
Upversioned to '1.0.3-SNAPSHOT'; amended README.
This commit is contained in:
parent
4d5f1d553d
commit
6e907cc85d
2 changed files with 39 additions and 26 deletions
63
README.md
63
README.md
|
|
@ -110,38 +110,29 @@ Parameters semantics:
|
||||||
|
|
||||||
Security warning: At the moment there is no check against directory traversal attack. So include feature may expose files outside of your wiki content-dir.
|
Security warning: At the moment there is no check against directory traversal attack. So include feature may expose files outside of your wiki content-dir.
|
||||||
|
|
||||||
## Advertisement
|
|
||||||
If you like what you see here, I am available for work on open source Clojure projects.
|
|
||||||
|
|
||||||
### Phoning home
|
|
||||||
Smeagol currently requests the WEFT logo in the page footer from my home site. This is mainly so I can get a feel for how many people are using the product. If you object to this, edit the file
|
|
||||||
|
|
||||||
resources/templates/base.html
|
|
||||||
|
|
||||||
and replace the line
|
|
||||||
|
|
||||||
<img height="16" width="16" alt="The Web Engineering Factory & Toolworks" src="http://www.weft.scot/images/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
|
|
||||||
|
|
||||||
with the line
|
|
||||||
|
|
||||||
<img height="16" width="16" alt="The Web Engineering Factory & Toolworks" src="img/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
|
|
||||||
|
|
||||||
## License
|
|
||||||
Copyright © 2014-2015 Simon Brooke. Licensed under the GNU General Public License,
|
|
||||||
version 2.0 or (at your option) any later version. If you wish to incorporate
|
|
||||||
parts of Smeagol into another open source project which uses a less restrictive
|
|
||||||
license, please contact me; I'm open to dual licensing it.
|
|
||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed.
|
You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed.
|
||||||
|
|
||||||
You will need [node](https://nodejs.org/en/) and [bower](https://bower.io/) installed.
|
You will need [node](https://nodejs.org/en/) and [bower](https://bower.io/) installed.
|
||||||
|
|
||||||
## Running
|
## Development
|
||||||
To start a web server for the application, run:
|
To start a development web server for the application, run:
|
||||||
|
|
||||||
lein bower install
|
lein bower install
|
||||||
lein ring server
|
lein repl
|
||||||
|
|
||||||
|
And then, when the repl starts up,
|
||||||
|
|
||||||
|
(start-server)
|
||||||
|
|
||||||
|
## Running
|
||||||
|
|
||||||
|
To build a standalone Smeagol jar file, run:
|
||||||
|
|
||||||
|
lein bower install
|
||||||
|
lein ring uberjar
|
||||||
|
|
||||||
|
**HOWEVER**, this will not run without [configuration](https://github.com/journeyman-cc/smeagol/blob/develop/resources/public/content/Environment%20Variables.md).
|
||||||
|
|
||||||
Alternatively, if you want to deploy to a servlet container (which I would strongly recommend), the simplest thing is to run:
|
Alternatively, if you want to deploy to a servlet container (which I would strongly recommend), the simplest thing is to run:
|
||||||
|
|
||||||
|
|
@ -172,3 +163,25 @@ To build your own Docker image, run:
|
||||||
lein docker build
|
lein docker build
|
||||||
|
|
||||||
This will build a new Docker image locally; you can, obviously, push it to your own Docker repository if you wish.
|
This will build a new Docker image locally; you can, obviously, push it to your own Docker repository if you wish.
|
||||||
|
|
||||||
|
## Advertisement
|
||||||
|
If you like what you see here, I am available for work on open source Clojure projects.
|
||||||
|
|
||||||
|
### Phoning home
|
||||||
|
Smeagol currently requests the WEFT logo in the page footer from my home site. This is mainly so I can get a feel for how many people are using the product. If you object to this, edit the file
|
||||||
|
|
||||||
|
resources/templates/base.html
|
||||||
|
|
||||||
|
and replace the line
|
||||||
|
|
||||||
|
<img height="16" width="16" alt="The Web Engineering Factory & Toolworks" src="http://www.weft.scot/images/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
|
||||||
|
|
||||||
|
with the line
|
||||||
|
|
||||||
|
<img height="16" width="16" alt="The Web Engineering Factory & Toolworks" src="img/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
|
||||||
|
|
||||||
|
## License
|
||||||
|
Copyright © 2014-2020 Simon Brooke. Licensed under the GNU General Public License,
|
||||||
|
version 2.0 or (at your option) any later version. If you wish to incorporate
|
||||||
|
parts of Smeagol into another open source project which uses a less restrictive
|
||||||
|
license, please contact me; I'm open to dual licensing it.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
(defproject smeagol "1.0.2"
|
(defproject smeagol "1.0.3-SNAPSHOT"
|
||||||
:description "A simple Git-backed Wiki inspired by Gollum"
|
:description "A simple Git-backed Wiki inspired by Gollum"
|
||||||
:url "https://github.com/simon-brooke/smeagol"
|
:url "https://github.com/simon-brooke/smeagol"
|
||||||
:license {:name "GNU General Public License,version 2.0 or (at your option) any later version"
|
:license {:name "GNU General Public License,version 2.0 or (at your option) any later version"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue