commit 21da818cdbad45160af01579d6be3fd8ff349c88 Author: Vasil Kolev Date: Sat Nov 5 22:18:25 2016 +0200 initial import diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..43cda6d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pdf +.*.swp +*-blog.txt +.depend diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d82ef8c --- /dev/null +++ b/Makefile @@ -0,0 +1,33 @@ +SLIDELEVEL=2 + +TARGETS=$(patsubst %.pandoc,%.pdf,$(wildcard *.pandoc)) $(patsubst %.pandoc,%-blog.txt,$(wildcard *.pandoc)) $(patsubst %.pandoc,%.epub,$(wildcard *.pandoc)) + +all: depend $(TARGETS) + +depend: .depend + +.depend: $(wildcard *.pandoc) makedep.sh + rm -f .depend + ./makedep.sh > .depend + +-include .depend + +%.pdf: %.pandoc beamer.my beamercolorthemekrok.sty + pandoc --slide-level $(SLIDELEVEL) -t beamer $< -H beamer.my --latex-engine=pdflatex -o $@ + +%.epub: %.pandoc beamer.my beamercolorthemekrok.sty + pandoc --slide-level $(SLIDELEVEL) -t epub $< --template beamer.my -V theme:Warsaw -V fonttheme:structurebold -V colortheme:krok -o $@ + +%.png: img/%.png + ./mkimg.sh $@ + +%.jpg: img/%.jpg + ./mkimg.sh $@ + +%-blog.txt: %.pandoc + php etxt.php $< > $@ +clean: + rm -f $(TARGETS) *.png .depend + +push: + git push origin master diff --git a/README.md b/README.md new file mode 100644 index 0000000..03f9a81 --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ +Presentation build system +========================= + + +Description +----------- + +This is what I use to build my slides. I have the following goals: + +* Easy to write +* Easy to change/copy-paste +* Automated formatting of images +* Automated rebuild when something changes +* Ability to write the text of the talk in the presentation +* Ability to extract the text of the presentation as a blog post +* Ability to easily track changes with a version control system + +For example on how to use, see ``example.pandoc``. + +Usage +----- + +* Write your presentation as *something*.pandoc +* Put your .png images in ``img/`` +* Run ``make`` +* Lather, rinse, repeat + +Requirements +------------ + +* Make +* php (for building the text) +* imagemagick (image manipulation) +* pandoc (duh) +* texlive-lang-cyrillic if you want to write in Cyrillic +* git (if you want to put this in a version control system, which I highly recommend) + +This all was tested/developed on Debian. + +Missing features +---------------- + +* Multiple images on one page + * This is not supported by pandoc in anyway, you'll need LaTeX for that +* Support for other images than png + * Too lazy to add it + diff --git a/beamer.my b/beamer.my new file mode 100644 index 0000000..2f70491 --- /dev/null +++ b/beamer.my @@ -0,0 +1 @@ +\usepackage[russian]{babel} diff --git a/beamercolorthemekrok.sty b/beamercolorthemekrok.sty new file mode 100644 index 0000000..c48e16d --- /dev/null +++ b/beamercolorthemekrok.sty @@ -0,0 +1,47 @@ +% Copyright 2007 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/licenses/LICENSE for more details. + +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/base/themes/color/beamercolorthemekrok.sty,v d02a7cf4d8ae 2010/06/17 09:11:41 rivanvx $ + + +\mode + +\definecolor{craneorange}{HTML}{008803} +\definecolor{craneblue}{HTML}{000000} + + +\setbeamercolor{structure}{fg=craneblue} + +\setbeamercolor{palette primary}{fg=craneblue,bg=craneorange!70} +\setbeamercolor{palette secondary}{fg=craneblue,bg=craneorange!80} +\setbeamercolor{palette tertiary}{fg=craneblue,bg=craneorange!90} +\setbeamercolor{palette quaternary}{fg=craneblue,bg=craneorange} + +\setbeamercolor{titlelike}{parent=palette quaternary} + +\setbeamercolor{block title}{fg=craneblue,bg=craneorange} +\setbeamercolor{block title alerted}{use=alerted text,fg=craneblue,bg=alerted text.fg!75!bg} +\setbeamercolor{block title example}{use=example text,fg=craneblue,bg=example text.fg!75!bg} + +\setbeamercolor{block body}{parent=normal text,use=block title,bg=block title.bg!25!bg} +\setbeamercolor{block body alerted}{parent=normal text,use=block title alerted,bg=block title alerted.bg!25!bg} +\setbeamercolor{block body example}{parent=normal text,use=block title example,bg=block title example.bg!25!bg} + +\setbeamercolor{sidebar}{bg=craneorange!70} + +\setbeamercolor{palette sidebar primary}{fg=craneblue} +\setbeamercolor{palette sidebar secondary}{fg=craneblue!75} +\setbeamercolor{palette sidebar tertiary}{fg=craneblue!75} +\setbeamercolor{palette sidebar quaternary}{fg=craneblue} + +\setbeamercolor*{separation line}{} +\setbeamercolor*{fine separation line}{} + +\mode + diff --git a/etxt.php b/etxt.php new file mode 100644 index 0000000..b7bd6f7 --- /dev/null +++ b/etxt.php @@ -0,0 +1,46 @@ +", 3)==0) { + $state=ST_OUT; + echo "\n"; + continue; + } + echo $row; + } + +} + diff --git a/img/balkon1.png b/img/balkon1.png new file mode 100755 index 0000000..487c62b Binary files /dev/null and b/img/balkon1.png differ diff --git a/img/isom.png b/img/isom.png new file mode 100644 index 0000000..8588924 Binary files /dev/null and b/img/isom.png differ diff --git a/img/network.png b/img/network.png new file mode 100644 index 0000000..2fa0379 Binary files /dev/null and b/img/network.png differ diff --git a/img/parter.png b/img/parter.png new file mode 100755 index 0000000..3d33b70 Binary files /dev/null and b/img/parter.png differ diff --git a/img/srva.jpg b/img/srva.jpg new file mode 100755 index 0000000..e102fc1 Binary files /dev/null and b/img/srva.jpg differ diff --git a/img/srvb1.jpg b/img/srvb1.jpg new file mode 100755 index 0000000..bad96d3 Binary files /dev/null and b/img/srvb1.jpg differ diff --git a/img/srvb2.jpg b/img/srvb2.jpg new file mode 100755 index 0000000..11f0c62 Binary files /dev/null and b/img/srvb2.jpg differ diff --git a/infra.pandoc b/infra.pandoc new file mode 100644 index 0000000..162ecac --- /dev/null +++ b/infra.pandoc @@ -0,0 +1,159 @@ +% Инфраструктурата на OpenFest 2016 +% жица, брат ми +% OpenFest team \ + +# За какво ще ви говорим + +## За какво ще ви говорим + +* Мрежа +* Wireless +* Monitoring +* Телефони +* Ток +* Видео + +## + +![Къде сме](isom.png) + +# Мрежа + +## +### Мрежа + +## + +![Логическа топология](network.png) + +## Цел + +* Гигабитова мрежа +* IPv4 и IPv6 +* Издръжлива на прекъсвания +* Да може да носи всичкия потребителски и служебен трафик + * много видео трафик + +## +### Хардуерна част + +## Техника + +* core switch-ове + * 7 x TP-Link SG3210 (буквално железни) + * 2 x Cisco 3750G +* workshop switch-ове (от кол и въже) + * HP 1800-24G + * 2 x Cisco 2970 + * 2 x Mikrotik cloud router switch +* router + * DL380 G5 +* много много кабели +* PoE инжектори + +## Снабдяване + +* Добри хора + * netissat (за поредна година) + * devhex + * securax + * initLab +* ebay + * изпадат понякога много евтино switch-ове + +## До-снабдяване + +* ПРИЕМАМЕ ДАРЕНИЯ + * наистина, малко гигабитова техника няма да откажем + * или 10-гигабитова + * ... или 100-гигабитова + +## Топология + +* Мрежа с много кръгове +* MSTP +* Жици навсякъде +* Един leaf, за NOC + * ако NOC-а не работи, ще пречи само на мрежарите + * те така и така не са хора + +## + +![Партер/1ви ет.](parter.png) + +## + +![1ви балkon/2ри ет.](balkon1.png) + +## Uplink + +* 300 mbps през NetX +* едно оптично трасе, което опънаха заради нас миналата година +* в момента влиза през фасадата през една тръба до нас + * моля не го режете, преди да свърши събитието + +## + +![Сървърно преди 1](srvb1.jpg) + +## + +![Сървърно преди 2](srvb2.jpg) + +## + +![Сървърно след](srva.jpg) + +## NOC мазе + +## +### Софтуерна част + +## routing и т.н. + +* прост linux +* deban iptables и NAT (бля) + +## подмрежи + +* management (ipv4 only) +* wired (ipv4 & ipv6) +* wireless (ipv4 & ipv6) +* video (ipv4 only) +* overflow (ipv4 only) +* Разделени по роли + +## Потребителски мрежи + +* странни ARP филтрирания + * ... които ще бъдат разказани в wifi частта +* филтриран порт 25 + * не си заслужава усилието +* Split DNS + * имахме за stream.openfest.org, да не ходят хората навън за stream-а + * тая година не се занимавахме (някой смени bind-а на unbound :) ) + +## Прост зонален firewall + +* Никой освен сървъра не може да си говори с не-потребителските vlan-и + + +# wireless + +## +### Wireless + +# Monitoring + +# Телефони + +# Ток + +# Видео + +# КРАЙ + +## +### Благодарим за вниманието! + + diff --git a/makedep.sh b/makedep.sh new file mode 100755 index 0000000..ff73e97 --- /dev/null +++ b/makedep.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +for i in *.pandoc; do + pdfn=`echo $i|sed s/\.pandoc$/.pdf/` + echo $pdfn: `grep '^!' "$i"|cut -d \( -f 2|cut -d \) -f 1|cut -d ' ' -f 1|sort|uniq ` +done diff --git a/missfont.log b/missfont.log new file mode 100644 index 0000000..9ec50c0 --- /dev/null +++ b/missfont.log @@ -0,0 +1 @@ +mktextfm lass1095 diff --git a/mkimg.sh b/mkimg.sh new file mode 100755 index 0000000..5ac6a55 --- /dev/null +++ b/mkimg.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +img=$1 + +geom=`identify -quiet -format '%G' img/$img` +width=`echo $geom |cut -d x -f 1` +height=`echo $geom |cut -d x -f 2` + +wantedwidth=`echo -e "scale=0\n$height"'*'"1.4"|bc|cut -d . -f 1` + +if [ $width -gt $wantedwidth ]; then + cp "img/$img" "$img" +else + convert "img/$img" -gravity center -extent ${wantedwidth}x${height} "$img" +fi diff --git a/srva.jpg b/srva.jpg new file mode 100755 index 0000000..e102fc1 Binary files /dev/null and b/srva.jpg differ diff --git a/srvb1.jpg b/srvb1.jpg new file mode 100755 index 0000000..bad96d3 Binary files /dev/null and b/srvb1.jpg differ diff --git a/srvb2.jpg b/srvb2.jpg new file mode 100755 index 0000000..11f0c62 Binary files /dev/null and b/srvb2.jpg differ