Documentation v1

Still missing a few sections

Documentation v1
Still missing a few sections
Antonio Terceiro
1 parent 2ffd92c7
Showing 8 changed files with 879 additions and 47 deletions Show diff stats
docs/architecture.dot
docs/arquitetura.png
docs/arquitetura.rst.in
docs/arquitetura.svg
docs/backup.rst.in
docs/firewall.rst.in
docs/local.mk
docs/manutencao.rst.in
@@ -1,27 +0,0 @@
-digraph architecture {
-
-  subgraph cluster_0 {
-    style=filled;
-    color="#d3d7cf";
-    label = "Local network";
-    node [style=filled,fillcolor=white];
-
-    reverseproxy  [shape=box];
-    social        [shape=box];
-    email         [shape=box];
-    integration   [shape=box];
-    database      [shape=box];
-
-    reverseproxy -> social    [label="HTTP"];
-    social -> integration     [label="HTTP"];
-    social -> database        [label="PostgreSQL (5432)"];
-    integration -> database   [label="PostgreSQL (5432)"];
-    email -> integration      [label="SMTP"];
-
-  }
-
-  internet  -> reverseproxy   [label="HTTP"];
-  internet  -> email          [label="SMTP"];
-  email     -> internet       [label="SMTP"];
-
-}
 Arquitetura
 ===========
  
-A figura a seguir representa a arquitetura do SPB.
+A arquitetura do SPB consiste em 5 servidores, representados na figura
+a seguir.
  
-.. TODO incluir uma figura feita manualmente, a gente deve ter isso de
-.. apresentações anterires
-.. image:: architecture.png
+.. image:: arquitetura.png
  
-TODO:
+Servidores e serviços
+---------------------
+
+*Esta seção é um trabalho em andamento. Ela cobrirá:*
  
 * descrever arquitetura
 * descrever papel de cada máquina
 * descrever conexões
-* adicionar links com o repositório de gestão de configuração
  
+Gestão de configuração
+----------------------
+
+*Esta seção é um trabalho em andamento. Ela cobrirá:*
+
+* adicionar links com o repositório de gestão de configuração
 * descrever repositório de gestão de configuração
 * descrever como o chake funciona
@@ -0,0 +1,818 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1052.3622"
+   height="744.09448"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="arquitetura.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path4235"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4217"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4232"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart-4"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4232-0"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.65045503"
+     inkscape:cx="526.18109"
+     inkscape:cy="372.04724"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer6"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="702"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-308.2677)"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Release 1"
+       style="display:inline">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         x="642.34241"
+         y="491.6839"
+         id="text5794"
+         sodipodi:linespacing="125%"><tspan
+           style="font-size:16.46647072px"
+           id="tspan5796"
+           sodipodi:role="line"
+           x="642.34241"
+           y="491.6839">HTTP</tspan><tspan
+           style="font-size:16.46647072px"
+           id="tspan5798"
+           sodipodi:role="line"
+           x="642.34241"
+           y="512.26697">reverse proxy</tspan></text>
+      <g
+         id="g4382"
+         transform="matrix(0.68610294,0,0,0.68610294,325.50286,328.94289)">
+        <g
+           transform="translate(-104.51642,-10.919621)"
+           id="g4315">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             id="rect4317"
+             width="703.53589"
+             height="193.43335"
+             x="45.238449"
+             y="819.93018"
+             rx="24.959101"
+             ry="24.959101" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.92820835px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             x="62.26289"
+             y="991.02106"
+             id="text4319"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4321"
+               x="62.26289"
+               y="991.02106"
+               style="font-size:22.5px;fill:#555753">database</tspan></text>
+        </g>
+        <g
+           style="display:inline"
+           id="g4246"
+           transform="matrix(1.0487632,0,0,1.0487632,-73.081866,298.25531)">
+          <rect
+             transform="translate(0,308.2677)"
+             ry="24.959145"
+             rx="24.959145"
+             y="205.91293"
+             x="99.836578"
+             height="106.07636"
+             width="215.27261"
+             id="rect4248"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text4250"
+             y="575.53479"
+             x="143.37675"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="575.53479"
+               x="143.37675"
+               id="tspan4252"
+               sodipodi:role="line">PostgreSQL</tspan></text>
+        </g>
+        <g
+           transform="matrix(1.0487632,0,0,1.0487632,218.62813,298.25532)"
+           id="g4263"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             id="rect4265"
+             width="215.27261"
+             height="106.07636"
+             x="99.836578"
+             y="205.91293"
+             rx="24.959145"
+             ry="24.959145"
+             transform="translate(0,308.2677)" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             x="178.57445"
+             y="575.53479"
+             id="text4267"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4269"
+               x="178.57445"
+               y="575.53479">Redis</tspan></text>
+        </g>
+      </g>
+      <g
+         id="g4396"
+         transform="matrix(0.68610294,0,0,0.68610294,548.29673,158.97368)">
+        <g
+           id="g4307"
+           transform="translate(-73.317486,-262.07101)">
+          <rect
+             ry="24.959101"
+             rx="24.959101"
+             y="819.93018"
+             x="45.238449"
+             height="385.60645"
+             width="641.40228"
+             id="rect4309"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text4311"
+             y="1185.0211"
+             x="62.26289"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.92820835px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="font-size:22.5px;fill:#555753"
+               y="1185.0211"
+               x="62.26289"
+               id="tspan4313"
+               sodipodi:role="line">integration</tspan></text>
+        </g>
+        <g
+           transform="matrix(1.0487632,0,0,1.0487632,-79.431935,244.40644)"
+           id="g3018"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             id="rect3020"
+             width="215.27261"
+             height="106.07636"
+             x="99.836578"
+             y="205.91293"
+             transform="translate(0,308.2677)"
+             rx="24.959145"
+             ry="24.959145" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             x="175.63876"
+             y="575.49884"
+             id="text3022"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3024"
+               x="175.63876"
+               y="575.49884">Gitlab</tspan></text>
+        </g>
+        <g
+           transform="matrix(1.0487632,0,0,1.0487632,-80.194985,44.124888)"
+           id="g3034"
+           style="display:inline">
+          <rect
+             transform="translate(0,308.2677)"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             id="rect3036"
+             width="215.27261"
+             height="106.07636"
+             x="99.836578"
+             y="205.91293"
+             rx="24.959145"
+             ry="24.959145" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             x="169.5842"
+             y="575.53479"
+             id="text3038"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3040"
+               x="169.5842"
+               y="575.53479">COLAB</tspan></text>
+        </g>
+        <g
+           transform="matrix(1.0487632,0,0,1.0487632,226.64988,243.33747)"
+           id="g4271"
+           style="display:inline">
+          <rect
+             transform="translate(0,308.2677)"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             id="rect4273"
+             width="215.27261"
+             height="106.07636"
+             x="99.836578"
+             y="205.91293"
+             rx="24.959145"
+             ry="24.959145" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             x="163.01907"
+             y="575.53479"
+             id="text4275"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4277"
+               x="163.01907"
+               y="575.53479">Mailman</tspan></text>
+        </g>
+        <g
+           style="display:inline"
+           id="g4288"
+           transform="matrix(1.0487632,0,0,1.0487632,226.64988,125.74526)">
+          <rect
+             ry="24.959145"
+             rx="24.959145"
+             y="205.91293"
+             x="99.836578"
+             height="106.07636"
+             width="215.27261"
+             id="rect4290"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             transform="translate(0,308.2677)" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text4292"
+             y="575.53479"
+             x="140.90532"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="575.53479"
+               x="140.90532"
+               id="tspan4294"
+               sodipodi:role="line">Mailman-API</tspan></text>
+        </g>
+      </g>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4541"
+         y="619.28687"
+         x="457.85617"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="619.28687"
+           x="457.85617"
+           sodipodi:role="line"
+           id="tspan4543"
+           style="font-size:16.46647072px">HTTP</tspan><tspan
+           y="639.86993"
+           x="457.85617"
+           sodipodi:role="line"
+           id="tspan4545"
+           style="font-size:16.46647072px">reverse proxy</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         x="649.13086"
+         y="657.7215"
+         id="text4547"
+         sodipodi:linespacing="125%"><tspan
+           style="font-size:16.46647072px;text-align:start;text-anchor:start"
+           id="tspan4549"
+           sodipodi:role="line"
+           x="649.13086"
+           y="657.7215">HTTP</tspan><tspan
+           style="font-size:16.46647072px;text-align:start;text-anchor:start"
+           id="tspan4551"
+           sodipodi:role="line"
+           x="649.13086"
+           y="678.30457">reverse proxy</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4553"
+         y="566.24707"
+         x="769.04694"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="566.24707"
+           x="769.04694"
+           sodipodi:role="line"
+           id="tspan4557"
+           style="font-size:16.46647072px;text-align:start;text-anchor:start">HTTP</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         x="345.62704"
+         y="851.43207"
+         id="text4561"
+         sodipodi:linespacing="125%"><tspan
+           style="font-size:16.46647072px"
+           id="tspan4565"
+           sodipodi:role="line"
+           x="345.62704"
+           y="851.43207">SQL</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4569"
+         y="753.59344"
+         x="485.86237"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="753.59344"
+           x="485.86237"
+           sodipodi:role="line"
+           id="tspan4571"
+           style="font-size:16.46647072px">SQL</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         x="513.03973"
+         y="822.08044"
+         id="text4573"
+         sodipodi:linespacing="125%"><tspan
+           style="font-size:16.46647072px"
+           id="tspan4575"
+           sodipodi:role="line"
+           x="513.03973"
+           y="822.08044">SQL</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4577"
+         y="850.34491"
+         x="643.99384"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="850.34491"
+           x="643.99384"
+           sodipodi:role="line"
+           id="tspan4579"
+           style="font-size:16.46647072px;text-align:start;text-anchor:start">Protocolo</tspan><tspan
+           y="870.92798"
+           x="643.99384"
+           sodipodi:role="line"
+           style="font-size:16.46647072px;text-align:start;text-anchor:start"
+           id="tspan4581">nativo</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4589"
+         y="556.0722"
+         x="177.66902"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="556.0722"
+           x="177.66902"
+           sodipodi:role="line"
+           id="tspan4591"
+           style="font-size:16.46647072px">SMTP</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4597"
+         y="505.26852"
+         x="432.2182"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.06708527px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="505.26852"
+           x="432.2182"
+           sodipodi:role="line"
+           id="tspan4599"
+           style="font-size:16.46647072px">SMTP</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Release 2"
+       style="display:inline">
+      <g
+         id="g4372"
+         transform="matrix(0.68610294,0,0,0.68610294,-257.62288,142.05473)">
+        <g
+           id="g4323"
+           transform="translate(471.10384,-45.23844)"
+           style="display:inline">
+          <rect
+             ry="24.959101"
+             rx="24.959101"
+             y="819.93018"
+             x="45.238449"
+             height="193.43336"
+             width="491.38315"
+             id="rect4325"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text4327"
+             y="991.02106"
+             x="62.26289"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.92820835px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="font-size:22.5px;fill:#555753"
+               y="991.02106"
+               x="62.26289"
+               id="tspan4329"
+               sodipodi:role="line">social</tspan></text>
+        </g>
+        <g
+           id="g3042"
+           transform="matrix(1.0487632,0,0,1.0487632,544.44394,276.5302)"
+           style="display:inline">
+          <rect
+             ry="24.959145"
+             rx="24.959145"
+             transform="translate(0,308.2677)"
+             y="205.91293"
+             x="99.836578"
+             height="106.07636"
+             width="215.27261"
+             id="rect3044"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text3046"
+             y="575.46283"
+             x="157.44057"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="575.46283"
+               x="157.44057"
+               id="tspan3048"
+               sodipodi:role="line">Noosfero</tspan></text>
+        </g>
+      </g>
+      <g
+         id="g4343"
+         transform="matrix(0.68610294,0,0,0.68610294,-313.27764,36.270151)">
+        <g
+           transform="translate(552.22106,-389.98662)"
+           id="g4331"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             id="rect4333"
+             width="491.38315"
+             height="193.43336"
+             x="45.238449"
+             y="819.93018"
+             rx="24.959101"
+             ry="24.959101" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.92820835px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             x="62.26289"
+             y="991.02106"
+             id="text4335"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4337"
+               x="62.26289"
+               y="991.02106"
+               style="font-size:22.5px;fill:#555753">email</tspan></text>
+        </g>
+        <g
+           transform="translate(277.45747,43.873309)"
+           id="g4240">
+          <g
+             id="g4232"
+             transform="matrix(1.0487632,0,0,1.0487632,348.10369,-112.09129)"
+             style="display:inline">
+            <rect
+               ry="24.959145"
+               rx="24.959145"
+               transform="translate(0,308.2677)"
+               y="205.91293"
+               x="99.836578"
+               height="106.07636"
+               width="215.27261"
+               id="rect4234"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate" />
+            <text
+               sodipodi:linespacing="125%"
+               id="text4236"
+               y="575.46283"
+               x="170.96269"
+               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               xml:space="preserve"><tspan
+                 y="575.46283"
+                 x="170.96269"
+                 id="tspan4238"
+                 sodipodi:role="line">Postfix</tspan></text>
+          </g>
+        </g>
+      </g>
+      <g
+         transform="matrix(0.68610294,0,0,0.68610294,-326.80522,364.9756)"
+         id="g4449">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#babdb6;stroke-width:2.91501451;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect4531"
+           width="257.68625"
+           height="245.36218"
+           x="494.24698"
+           y="743.06433"
+           rx="9.5793791"
+           ry="9.5793791" />
+        <g
+           style="display:inline"
+           transform="translate(471.03,-45.23844)"
+           id="g4451">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             id="rect4453"
+             width="213.55743"
+             height="65.710571"
+             x="45.238449"
+             y="947.65295"
+             rx="15.452409"
+             ry="15.452409" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.92820835px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             x="62.26289"
+             y="991.02106"
+             id="text4455"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4457"
+               x="62.26289"
+               y="991.02106"
+               style="font-size:22.5px;fill:#555753">servidor</tspan></text>
+        </g>
+        <g
+           style="display:inline"
+           transform="matrix(1.0487632,0,0,1.0487632,410.82571,289.93364)"
+           id="g4459">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             id="rect4461"
+             width="106.31865"
+             height="52.388897"
+             x="99.836578"
+             y="205.91293"
+             transform="translate(0,308.2677)"
+             rx="6.5724359"
+             ry="6.5724359" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             x="112.57272"
+             y="546.08508"
+             id="text4463"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4465"
+               x="112.57272"
+               y="546.08508">Serviço</tspan></text>
+        </g>
+        <g
+           id="g4526"
+           transform="translate(0,3.0637686e-6)">
+          <path
+             sodipodi:nodetypes="cc"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart-4);enable-background:accumulate"
+             d="m 615.18822,805.26531 -99.9181,0.22208"
+             id="path4467"
+             inkscape:connector-curvature="0" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text4522"
+             y="794.6015"
+             x="515.53412"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.40509987px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               y="794.6015"
+               x="515.53412"
+               id="tspan4524"
+               sodipodi:role="line">conexão</tspan></text>
+        </g>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.40509987px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+           x="665.66437"
+           y="769.95325"
+           id="text4533"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4535"
+             x="665.66437"
+             y="769.95325"
+             style="-inkscape-font-specification:'Cantarell Bold';font-family:Cantarell;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;fill:#555753;">Legenda</tspan></text>
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer6"
+       inkscape:label="Release 3"
+       style="display:inline">
+      <g
+         id="g4358"
+         transform="matrix(0.68610294,0,0,0.68610294,499.06367,112.26031)">
+        <g
+           transform="translate(-1.5599465,-500.74283)"
+           id="g4302"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:0.61568627;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             id="rect4296"
+             width="491.38315"
+             height="193.43336"
+             x="45.238449"
+             y="819.93018"
+             rx="24.959101"
+             ry="24.959101" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.92820835px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             x="62.26289"
+             y="991.02106"
+             id="text4298"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4300"
+               x="62.26289"
+               y="991.02106"
+               style="font-size:22.5px;fill:#555753">reverseproxy</tspan></text>
+        </g>
+        <g
+           id="g3987"
+           transform="matrix(1.0487632,0,0,1.0487632,71.78015,-178.97419)"
+           style="display:inline">
+          <rect
+             ry="24.959145"
+             rx="24.959145"
+             y="205.91293"
+             x="99.836578"
+             height="106.07636"
+             width="215.27261"
+             id="rect3989"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55984557;marker:none;enable-background:accumulate"
+             transform="translate(0,308.2677)" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text3991"
+             y="575.11481"
+             x="126.62383"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="575.11481"
+               x="126.62383"
+               id="tspan3993"
+               sodipodi:role="line">Frontend HTTP</tspan></text>
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path5590"
+         d="m 634.01413,553.48165 c -0.36236,-61.8148 62.32682,-56.21368 62.508,-114.76719"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         d="m 642.85409,689.15591 0.62824,-49.04397"
+         id="path4433"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         d="M 859.12722,609.13106 C 829.91865,575.18646 753.05114,554.30963 723.07388,599.54037"
+         id="path4437"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4439"
+         d="m 271.00931,696.41651 c -0.36236,-61.8148 48.40654,-100.93072 283.89148,-100.93072"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4441"
+         d="m 630.55501,896.50178 c -2.09667,-64.00693 20.40483,-66.51846 19.07686,-115.92023"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         d="M 397.48723,898.80785 C 397.78887,788.16087 262.61615,877.38604 264.36295,782.88763"
+         id="path4443"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4445"
+         d="m 424.41946,896.50178 c -1.80573,-37.68499 12.38386,-120.28208 48.96766,-120.62805 38.60999,-0.36513 5.96395,-98.15121 42.04501,-99.61416 86.6488,-3.51329 82.65006,9.13901 86.41488,-35.58008"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         sodipodi:nodetypes="cssc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         d="M 450.58299,896.50178 C 451.5611,765.36235 628.56982,888.6602 627.24185,779.81286"
+         id="path4447"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         d="m 260.24762,444.28533 c 2.71241,99.61065 -131.46755,100.46675 -126.5904,221.92019"
+         id="path4583"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4585"
+         d="m 301.98953,444.28533 c -11.02329,92.39356 107.94916,65.41353 177.6501,74.78698 29.8001,4.00755 50.59374,14.66025 48.37091,44.1284"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.02915442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:url(#Arrow2Lstart);enable-background:accumulate"
+         sodipodi:nodetypes="csc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Manutenção"
+     style="display:inline" />
+</svg>
+Procedimentos de Backup
+=======================
+
 Backup
-======
+------
+
+*Esta seção é um trabalho em andamento.*
  
+Restore
+-------
  
+*Esta seção é um trabalho em andamento.*
@@ -4,19 +4,35 @@ Gestão do Firewall
 Firewall Interno
 -----------------
  
-O Portal do Software Público atualmente é composto por diversos serviços funcionando em diferentes servidores. Para o seu correto funcionamento é esperado que estes serviços se comuniquem através de TCP/IP.
+O Portal do Software Público atualmente é composto por diversos serviços
+funcionando em diferentes servidores. Para o seu correto funcionamento é
+esperado que estes serviços se comuniquem através de TCP/IP.
  
-Os scripts de instalação do Portal do Software Público também cuidam da manutenção das regras de firewall. Cada máquina possui um firewall (iptables) local que por padrão nega todos os tipos de conexão de entrada em todas as portas (INPUT rules) mas permite conexões de saída (OUTPUT rules).
+Os scripts de instalação do Portal do Software Público também cuidam da
+manutenção das regras de firewall. Cada máquina possui um firewall
+(iptables) local que por padrão nega todos os tipos de conexão de
+entrada em todas as portas (INPUT rules) mas permite conexões de saída
+(OUTPUT rules).
  
-Todas as regras de firewall são definidas no cookbook ``firewall``. Para definir regras de comunidacação entre hosts locais, válidas para todos os ambientes (local, produção, homologação, testes, etc) são utilizados templates que podem ser encontrados em ``cookbooks/firewall/templates/``. Para regras de filtro utilize o arquivo ``iptables-filter.erb`` e para regras de nat o arquivo ``iptables-nat.erb``.
+Todas as regras de firewall são definidas no cookbook ``firewall``. Para
+definir regras de comunidacação entre hosts locais, válidas para todos
+os ambientes (local, produção, homologação, testes, etc) são utilizados
+templates que podem ser encontrados em
+``cookbooks/firewall/templates/``. Para regras de filtro utilize o
+arquivo ``iptables-filter.erb`` e para regras de `NAT` o arquivo
+``iptables-nat.erb``.
  
-Para adicionar regras específicas de cada ambiente (por exemplo, abrir uma porta diferente em homologação) utilize o arquivo ``config/<nome_do_ambiente>/iptables-filter-rules``. Este arquivo aceita apenas regras de filtro do tipo INPUT.
+Para adicionar regras específicas de cada ambiente (por exemplo, abrir
+uma porta diferente em homologação) utilize o arquivo
+``config/@@SPB_ENV@@/iptables-filter-rules``. Este arquivo aceita apenas
+regras de filtro do tipo INPUT.
  
  
 Comunicação Entre Serviços
 ++++++++++++++++++++++++++++
  
-Os serviços que compõe o portal e suas portas de entrada são descritos na tabela a seguir:
+Os serviços que compõe o portal e suas portas de entrada são descritos
+na tabela a seguir:
  
 ============= ============= ============== =====
 Destino       Origem        Serviço        Porta
@@ -49,4 +65,8 @@ reverseproxy OpenSSH (git) 22
  
 **Outros firewalls da rede:**
  
-Além do firewall local é importante que os serviços com origem ``externa`` tenham suas portas de INPUT abertas em todos os firewalls da rede. No caso do host ``email`` a porta **25** também deve estar aberta para OUTPUT (alternativamente o Postfix pode ser configurado para enviar e-mails utilizando um relay interno).
+Além do firewall local é importante que os serviços com origem
+``externa`` tenham suas portas de INPUT abertas em todos os firewalls da
+rede. No caso do host ``email`` a porta **25** também deve estar aberta
+para OUTPUT (alternativamente o Postfix pode ser configurado para enviar
+e-mails utilizando um relay interno).
 # autogenerated DNS documentation
  
+SPB_ENV ?= local
+
 BUILT += dns.rst
 dns.rst: ../test/dns_test.sh
 	(cd .. && sh test/dns_test.sh --doc) > $@
  
-BUILT += architecture.png
-architecture.png: architecture.dot
-	dot -Tpng -o $@ $<
-
-SPB_ENV ?= local
+BUILT += arquitetura.png
+%.png: %.svg
+	inkscape --export-area-page --export-width=800 --export-width=600 --export-png=$@ $<
  
 BUILT += $(patsubst %.in, %, $(wildcard *.in))
 %: %.in build.rb
 Manutenção
 ==========
  
-* mantendo o sistema atualizado
+Mantendo o sistema atualizado
+-----------------------------
  
-* modificando configurações
+*Esta seção é um trabalho em andamento.*
+
+Modificando configurações
+-------------------------
+
+*Esta seção é um trabalho em andamento.*
...	...	@@ -1,27 +0,0 @@
1		-digraph architecture {
2		-
3		- subgraph cluster_0 {
4		- style=filled;
5		- color="#d3d7cf";
6		- label = "Local network";
7		- node [style=filled,fillcolor=white];
8		-
9		- reverseproxy [shape=box];
10		- social [shape=box];
11		- email [shape=box];
12		- integration [shape=box];
13		- database [shape=box];
14		-
15		- reverseproxy -> social [label="HTTP"];
16		- social -> integration [label="HTTP"];
17		- social -> database [label="PostgreSQL (5432)"];
18		- integration -> database [label="PostgreSQL (5432)"];
19		- email -> integration [label="SMTP"];
20		-
21		- }
22		-
23		- internet -> reverseproxy [label="HTTP"];
24		- internet -> email [label="SMTP"];
25		- email -> internet [label="SMTP"];
26		-
27		-}
1	1	Arquitetura
2	2	===========
3	3
4		-A figura a seguir representa a arquitetura do SPB.
	4	+A arquitetura do SPB consiste em 5 servidores, representados na figura
	5	+a seguir.
5	6
6		-.. TODO incluir uma figura feita manualmente, a gente deve ter isso de
7		-.. apresentações anterires
8		-.. image:: architecture.png
	7	+.. image:: arquitetura.png
9	8
10		-TODO:
	9	+Servidores e serviços
	10	+---------------------
	11	+
	12	+Esta seção é um trabalho em andamento. Ela cobrirá:
11	13
12	14	* descrever arquitetura
13	15	* descrever papel de cada máquina
14	16	* descrever conexões
15		-* adicionar links com o repositório de gestão de configuração
16	17
	18	+Gestão de configuração
	19	+----------------------
	20	+
	21	+Esta seção é um trabalho em andamento. Ela cobrirá:
	22	+
	23	+* adicionar links com o repositório de gestão de configuração
17	24	* descrever repositório de gestão de configuração
18	25	* descrever como o chake funciona
...	...
	1	+Procedimentos de Backup
	2	+=======================
	3	+
1	4	Backup
2		-======
	5	+------
	6	+
	7	+Esta seção é um trabalho em andamento.
3	8
	9	+Restore
	10	+-------
4	11
	12	+Esta seção é um trabalho em andamento.
...	...
...	...	@@ -4,19 +4,35 @@ Gestão do Firewall
4	4	Firewall Interno
5	5	-----------------
6	6
7		-O Portal do Software Público atualmente é composto por diversos serviços funcionando em diferentes servidores. Para o seu correto funcionamento é esperado que estes serviços se comuniquem através de TCP/IP.
	7	+O Portal do Software Público atualmente é composto por diversos serviços
	8	+funcionando em diferentes servidores. Para o seu correto funcionamento é
	9	+esperado que estes serviços se comuniquem através de TCP/IP.
8	10
9		-Os scripts de instalação do Portal do Software Público também cuidam da manutenção das regras de firewall. Cada máquina possui um firewall (iptables) local que por padrão nega todos os tipos de conexão de entrada em todas as portas (INPUT rules) mas permite conexões de saída (OUTPUT rules).
	11	+Os scripts de instalação do Portal do Software Público também cuidam da
	12	+manutenção das regras de firewall. Cada máquina possui um firewall
	13	+(iptables) local que por padrão nega todos os tipos de conexão de
	14	+entrada em todas as portas (INPUT rules) mas permite conexões de saída
	15	+(OUTPUT rules).
10	16
11		-Todas as regras de firewall são definidas no cookbook ``firewall``. Para definir regras de comunidacação entre hosts locais, válidas para todos os ambientes (local, produção, homologação, testes, etc) são utilizados templates que podem ser encontrados em ``cookbooks/firewall/templates/``. Para regras de filtro utilize o arquivo ``iptables-filter.erb`` e para regras de nat o arquivo ``iptables-nat.erb``.
	17	+Todas as regras de firewall são definidas no cookbook ``firewall``. Para
	18	+definir regras de comunidacação entre hosts locais, válidas para todos
	19	+os ambientes (local, produção, homologação, testes, etc) são utilizados
	20	+templates que podem ser encontrados em
	21	+``cookbooks/firewall/templates/``. Para regras de filtro utilize o
	22	+arquivo ``iptables-filter.erb`` e para regras de `NAT` o arquivo
	23	+``iptables-nat.erb``.
12	24
13		-Para adicionar regras específicas de cada ambiente (por exemplo, abrir uma porta diferente em homologação) utilize o arquivo ``config/<nome_do_ambiente>/iptables-filter-rules``. Este arquivo aceita apenas regras de filtro do tipo INPUT.
	25	+Para adicionar regras específicas de cada ambiente (por exemplo, abrir
	26	+uma porta diferente em homologação) utilize o arquivo
	27	+``config/@@SPB_ENV@@/iptables-filter-rules``. Este arquivo aceita apenas
	28	+regras de filtro do tipo INPUT.
14	29
15	30
16	31	Comunicação Entre Serviços
17	32	++++++++++++++++++++++++++++
18	33
19		-Os serviços que compõe o portal e suas portas de entrada são descritos na tabela a seguir:
	34	+Os serviços que compõe o portal e suas portas de entrada são descritos
	35	+na tabela a seguir:
20	36
21	37	============= ============= ============== =====
22	38	Destino Origem Serviço Porta
...	...	@@ -49,4 +65,8 @@ reverseproxy OpenSSH (git) 22
49	65
50	66	Outros firewalls da rede:
51	67
52		-Além do firewall local é importante que os serviços com origem ``externa`` tenham suas portas de INPUT abertas em todos os firewalls da rede. No caso do host ``email`` a porta 25 também deve estar aberta para OUTPUT (alternativamente o Postfix pode ser configurado para enviar e-mails utilizando um relay interno).
	68	+Além do firewall local é importante que os serviços com origem
	69	+``externa`` tenham suas portas de INPUT abertas em todos os firewalls da
	70	+rede. No caso do host ``email`` a porta 25 também deve estar aberta
	71	+para OUTPUT (alternativamente o Postfix pode ser configurado para enviar
	72	+e-mails utilizando um relay interno).
...	...
1	1	# autogenerated DNS documentation
2	2
	3	+SPB_ENV ?= local
	4	+
3	5	BUILT += dns.rst
4	6	dns.rst: ../test/dns_test.sh
5	7	(cd .. && sh test/dns_test.sh --doc) > $@
6	8
7		-BUILT += architecture.png
8		-architecture.png: architecture.dot
9		- dot -Tpng -o $@ $<
10		-
11		-SPB_ENV ?= local
	9	+BUILT += arquitetura.png
	10	+%.png: %.svg
	11	+ inkscape --export-area-page --export-width=800 --export-width=600 --export-png=$@ $<
12	12
13	13	BUILT += $(patsubst %.in, %, $(wildcard *.in))
14	14	%: %.in build.rb
...	...
1	1	Manutenção
2	2	==========
3	3
4		-* mantendo o sistema atualizado
	4	+Mantendo o sistema atualizado
	5	+-----------------------------
5	6
6		-* modificando configurações
	7	+Esta seção é um trabalho em andamento.
	8	+
	9	+Modificando configurações
	10	+-------------------------
	11	+
	12	+Esta seção é um trabalho em andamento.
...	...