diff options
author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-04 10:17:59 +0200 |
---|---|---|
committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-04 10:17:59 +0200 |
commit | 71071120a4b90aaaf8e44596121cd298f7ecae4c (patch) | |
tree | 79bb283c837d04df02677ed004d1cc3d66edc455 | |
parent | ae2e2bdb68d8d3a5b1a0acf1b3f547600c6c699f (diff) | |
parent | 0e578f49ab5c47b5b2722bfa491aa3c8099978fb (diff) |
Merge branch 'master' into 2018-05-28-board
-rw-r--r-- | 2019/Makefile | 19 | ||||
-rw-r--r-- | agenda/Makefile | 13 | ||||
-rw-r--r-- | agenda/board-meeting-agenda.tex | 11 | ||||
-rw-r--r-- | preamble/preamble.tex | 20 |
4 files changed, 54 insertions, 9 deletions
diff --git a/2019/Makefile b/2019/Makefile new file mode 100644 index 0000000..352154d --- /dev/null +++ b/2019/Makefile @@ -0,0 +1,19 @@ +# Makefile for minutes of 2019 + +MINUTES = \ + + +common-makefile = ../resources/Makefile-common + +help: + @make -s -f $(common-makefile) help + +all: $(MINUTES) + +%: + make -f $(common-makefile) compile FILE=$* + +send: + make -f $(common-makefile) send SEND_FILES="$(MINUTES)" +clean: + make -f $(common-makefile) clean diff --git a/agenda/Makefile b/agenda/Makefile index a518a72..3ff045d 100644 --- a/agenda/Makefile +++ b/agenda/Makefile @@ -2,9 +2,13 @@ # # Gustav Eek 2011 -all: \ -board-meeting-agenda.pdf \ -yearly-meeting-agenda.pdf \ +ALL = \ +board-meeting-agenda \ +yearly-meeting-agenda \ + +common-makefile = ../resources/Makefile-common + +all: $(addsuffix .pdf, $(ALL)) %.pdf: %.tex ../preamble/preamble.tex latex_count=5 ; \ @@ -14,8 +18,7 @@ yearly-meeting-agenda.pdf \ do echo "Rerunning latex...." ; pdflatex $<; latex_count=`expr $$latex_count - 1`; done send: # sends to fripost.org for publication - umask 022 ;\ - rsync -ruvp --chmod=Dugo+rx,Fugo+r *.pdf www.fripost.org:/var/www/fripost.org/minutes + make -f $(common-makefile) send SEND_FILES="$(ALL)" clean: rm *.aux *.bbl *.dvi *.log *.nav *.out *.snm *.toc *~ diff --git a/agenda/board-meeting-agenda.tex b/agenda/board-meeting-agenda.tex index 782d10c..ab7571d 100644 --- a/agenda/board-meeting-agenda.tex +++ b/agenda/board-meeting-agenda.tex @@ -1,15 +1,17 @@ \input{../preamble/preamble} -\newcommand \creationdate {12 dec 2016} -%\newcommand \meetingplace {Gnutiken, Göteborg} +\newcommand \creationdate {22 oct 2018} \rhead{\footnotesize Förslag till dagordning} \begin{document} -%\selectlanguage{british} \selectlanguage{swedish} \section*{Stående förslag till dagordning \\ Friposts styrelsemöten} \vfill +Mötestid 1 h 30'. Paus efter 45'. + +\vfill + \begin{enumerate} \item Mötets öppnande \item Övrig mötesformalia @@ -50,6 +52,9 @@ \item Mötets avslutande \end{enumerate} +Mötesdeltagarna bör hjälpas åt (rotera) att ta med frukt eller dylik +fika till möten. + \vfill Gustav Eek, Göteborg, \creationdate diff --git a/preamble/preamble.tex b/preamble/preamble.tex index 45030ab..a6ed1c2 100644 --- a/preamble/preamble.tex +++ b/preamble/preamble.tex @@ -50,6 +50,7 @@ \newcommand \acta {\textsc{acta}} \newcommand \antilop {\texthost{antilop}} \newcommand \benjamin {\texthost{benjamin}} +\newcommand \bgp {\textsc{bgp}} \newcommand \cacert {\textsc{ca}cert} \newcommand \cfengine {\textsc{cf}-engine} \newcommand \civett {\texthost{civett}} @@ -59,6 +60,8 @@ \newcommand \dfrii {Föreningen för Digitala Fri- och Rättigheter (\textsc{dfri})} \newcommand \dkim {\textsc{dkim}} \newcommand \dkimm {\textsc{dkim} (\textit{DomainKeys Identified Mail})} +\newcommand \dmarc {\textsc{dmarc}} +\newcommand \dmarcc {\dmarc\ (Domain-based Message Authentication, Reporting and Conformance)} \newcommand \dns {\textsc{dns}} \newcommand \dnss {\textsc{dns} (Domain Name System)} \newcommand \dnssec {\textsc{dnssec}} @@ -68,11 +71,16 @@ \newcommand \etcdagens {\textit{Dagens \etc}} \newcommand \eu {\textsc{eu}} \newcommand \faq {\textsc{faq}} +\newcommand \fossgbg {\textsc{foss-gbg}} +\newcommand \fossnorth {\textsc{foss} North} \newcommand \fps {\textsc{fps}} \newcommand \fpss {Friprogramvarusyndikatet (\fps)} +\newcommand \fpsss {Friprogramvarusyndikatets (\fps)} \newcommand \fra {\textsc{fra}} \newcommand \fraa {\textsc{fra} (Försvarets radioanstalt)} \newcommand \fripost {\textsf{\textsc{\small Fripost}}} +\newcommand \flfd {\textsc{flfd}} +\newcommand \flfdd {Fripost Lagring för delning (\flfd)} \newcommand \fscons {\textsc{fscons}} \newcommand \fsfe {\textsc{fsfe}} \newcommand \gdpr {\textsc{gdpr}} @@ -83,14 +91,17 @@ \newcommand \gpg {\textsc{gpg}} \newcommand \gpgg {\gpg\ (\gnu\ Privacy Guard)} \newcommand \harvey {\texthost{harvey}} +\newcommand \icmp {\textsc{icmp}} \newcommand \imap {\textsc{imap}} \newcommand \ip {\textsc{ip}} +\newcommand \ipvfour {\textsc{ip}v4} +\newcommand \ipvsix {\textsc{ip}v6} \newcommand \ipred {\textsc{ipred}} \newcommand \ipsec {\textsc{ipsec}} \newcommand \isp {\textsc{isp}} \newcommand \isplong {\textsc{isp} (\textit{Internet Service Provider})} \newcommand \ituniv {\textsc{it}-universitetet} -\newcommand \jak {\textsc{jak}} +\newcommand \jak {\textsc{jak}-banken} \newcommand \ldap {\textsc{ldap}} \newcommand \ldapp {\ldap\ (Lightweight Directory Access Protocol)} \newcommand \lool {\textsc{lool}} @@ -106,6 +117,8 @@ \newcommand \mysql {\textsc{m}y\textsc{sql}} \newcommand \nsa {\textsc{nsa}} \newcommand \nsaa {\textsc{nsa} (\textit{National Security Agency}, \textsc{usa}:s federala säkerhetsmyndighet)} +\newcommand \nsu {\textsc{nsu}} +\newcommand \nsuu {Nordiskt Sommaruniversitet (\nsu)} \newcommand \nat {\textsc{nat}} \newcommand \natt {\textsc{nat} (Network Address Translation)} \newcommand \nti {\textsc{nti}} @@ -115,6 +128,8 @@ \newcommand \ossec {\textsc{ossec}} \newcommand \otrs {\textsc{otrs}} \newcommand \otrss {\otrs\ (Open-source Ticket Request System)} +\newcommand \issi {\textsc{issi}} +\newcommand \issii {\issi\ (Open Suorce Seed Initiative)} \newcommand \paypal {PayPal} \newcommand \pgp {\textsc{pgp}} \newcommand \prq {\textsc{prq}} @@ -135,7 +150,10 @@ \newcommand \sun {Sun} \newcommand \sql {\textsc{sql}} \newcommand \srpfyra {\textsc{sr p4}} +\newcommand \tcp {\textsc{tcp}} \newcommand \tls {\textsc{tls}} +\newcommand \tlss {\textsc{tls} (Transport Layer Secuity)} +\newcommand \udp {\textsc{udp}} \newcommand \usb {\textsc{usb}} \newcommand \vlan {\textsc{vlan}} % virtual LAN, different LAN:s on the same broadcast domain \newcommand \vps {\textsc{vps}} |