aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-07-13 11:33:42 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-07-13 11:33:42 -0300
commit65c88cf4770dff781249f6d5b470c01a9a0c6d04 (patch)
treec21fefcecc5e6a3858eb9155753b2ada42939daa
parent745cd614e263f6c94fa628e86fc3f330faf6ae6a (diff)
parent5e0d09354cfc1f66390719dc29dca5ddba08224a (diff)
downloadblog-65c88cf4770dff781249f6d5b470c01a9a0c6d04.tar.gz
blog-65c88cf4770dff781249f6d5b470c01a9a0c6d04.tar.bz2
Merge branch 'master' into develop
-rw-r--r--Makefile4
-rw-r--r--fisl.mdwn5
-rw-r--r--fisl/Makefile2
-rw-r--r--fisl/slides.pdfbin0 -> 2156300 bytes
-rw-r--r--static.mdwn2
5 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 635ffef..e39b5e3 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 39506b2..f3d09ca 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 0000000..9809cb1
--- /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 0000000..3bd0ff4
--- /dev/null
+++ b/fisl/slides.pdf
Binary files differ
diff --git a/static.mdwn b/static.mdwn
index eaab29b..734df0e 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.