diff --git a/Makefile b/Makefile index 635ffef8000a4868ae1ae55afa70e061eaf5b33c..e39b5e365d15033a2351d438f07fdb4a87db00e8 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # -wiki: +web: @ikiwiki --setup ikiwiki.setup -wiki_deploy: +web_deploy: @rsync -avz --delete www/ blog:/var/sites/rhatto/www/ diff --git a/fisl.mdwn b/fisl.mdwn index 39506b20e56c98477604d03136ec1c9b59b67f60..f3d09ca6a4d4cc368fb2498965c8113a63c0cbb0 100644 --- a/fisl.mdwn +++ b/fisl.mdwn @@ -1,8 +1,9 @@ -# A Internet das Coisas Livres vencendo os gigantes da vigilância e do controle +[[!meta title="A Internet das Coisas Livres vencendo os gigantes da vigilância e do controle"]] -* FISL16 - 2015 +* FISL16 - 10/07/2015 * rhatto.sarava.org/fisl / rhatto @ sarava.org * `66CA 01CE 2BF2 C9B7 E8D6 4E34 0546 8239 64E3 9FCA` +* [Slides](slides.pdf). # Distopia diff --git a/fisl/Makefile b/fisl/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..9809cb178026619eb0a9508887677af2a9aa6b79 --- /dev/null +++ b/fisl/Makefile @@ -0,0 +1,2 @@ +all: + pandoc -t beamer ../fisl.mdwn -o slides.pdf diff --git a/fisl/slides.pdf b/fisl/slides.pdf new file mode 100644 index 0000000000000000000000000000000000000000..3bd0ff4f92c8243b87897844c39a2df9219c0a1e Binary files /dev/null and b/fisl/slides.pdf differ diff --git a/static.mdwn b/static.mdwn index eaab29bc628ea89adb206efa948cad6059eef76e..734df0eb0e2f7d1bd41f1cdce8ce8b007757977f 100644 --- a/static.mdwn +++ b/static.mdwn @@ -34,7 +34,7 @@ It's a good pratice to keep your work under version control: ## Add a bit of sofistication -* Use [this Makefile](/Makefile) as an starting point to refresh and publish your wiki by simply running `make`. +* Use [this Makefile](/Makefile) as an starting point to refresh and publish your wiki by simply running `make web`. * Use a [complete ikiwiki template](https://git.sarava.org/?p=templates.git;a=tree;f=ikiwiki;h=HEAD) and change to your needs. * If you're a automation junkie, try the [puppet-ikiwiki](https://git.sarava.org/puppet-ikiwiki.git) module.