Merge branch 'stable-4.x'

Lucas Kanashiro
2 parents ac727c47 c3b96cd5
Showing 216 changed files with 757 additions and 125 deletions Show diff stats
config/cdtc/config.yaml
config/dev/config.yaml
config/homologa/config.yaml
config/lappis/config.yaml
config/local/config.yaml
config/prod/config.yaml
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/00-custom_settings.py.erb
cookbooks/colab/templates/colab.conf.erb
cookbooks/noosfero/files/noosfero.yml
cookbooks/noosfero/templates/nginx.conf.erb
cookbooks/reverse_proxy/files/host-reverseproxy/dev.sisp.gov.br.crt
cookbooks/reverse_proxy/files/host-reverseproxy/dev.sisp.gov.br.key
cookbooks/reverse_proxy/files/host-reverseproxy/sisp.dev.crt
cookbooks/reverse_proxy/files/host-reverseproxy/sisp.dev.key
cookbooks/reverse_proxy/files/host-reverseproxy/sisp.lappis.crt
cookbooks/reverse_proxy/files/host-reverseproxy/sisp.lappis.key
cookbooks/reverse_proxy/recipes/default.rb
cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
docs/apoio.rst.in
 admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
 external_hostname: spb.cdtc.unb.br
+sisp_external_hostname: sisp.cdtc.unb.br
 external_ip: 164.41.9.49
 site_url: https://spb.cdtc.unb.br
 colab_from_address: '"Portal do Software Publico" <noreply@spb.cdtc.unb.br>'
 admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
 external_hostname: dev.softwarepublico.gov.br
+sisp_external_hostname: dev.sisp.gov.br
 external_ip: 189.9.151.16
 alternative_hostnames:
   - www.dev.softwarepublico.gov.br
@@ -4,6 +4,7 @@ admins:
   - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]
   - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]
 external_hostname: homologa.softwarepublico.gov.br
+sisp_external_hostname: homologa.sisp.gov.br
 external_ip: 189.9.151.65
 alt_ssh_port: 55555
 site_url: https://homologa.softwarepublico.gov.br
@@ -2,6 +2,7 @@ admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
 site_url: https://softwarepublico.lappis
 external_hostname: softwarepublico.lappis
+sisp_external_hostname: sisp.lappis
 external_ip: 10.0.0.11
 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
 server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
@@ -2,6 +2,7 @@ admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
 site_url: https://softwarepublico.dev
 external_hostname: softwarepublico.dev
+sisp_external_hostname: sisp.dev
 alternative_hostnames:
   - www.softwarepublico.dev
   - beta.softwarepublico.dev
@@ -5,6 +5,7 @@ admins:
   - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]
 site_url: https://softwarepublico.gov.br
 external_hostname: softwarepublico.gov.br
+sisp_external_hostname: novo.sisp.gov.br
 alternative_hostnames:
   - www.softwarepublico.gov.br
   - portal.softwarepublico.gov.br
@@ -11,6 +11,11 @@ if node[&#39;platform&#39;] == &#39;centos&#39;
   end
 end
+# remove link left behind by old colab packages
+file '/usr/share/nginx/colab' do
+  action :delete
+end
+
 package 'colab' do
   action :upgrade
   notifies :restart, 'service[colab]'
@@ -190,6 +195,11 @@ execute &#39;colab-mailman-group&#39; do
   command "usermod -a -G mailman colab"
 end
+# Collect static is here instead of colab.spec because
+#   plugins might provide their own static files, as
+#   the package don't know about installed plugins
+#   collectstatic needs to run after package install
+#   and plugins instantiated. Same for migrate.
 execute 'colab-admin migrate'
 execute 'colab-admin:collectstatic' do
   command 'colab-admin collectstatic --noinput'
@@ -28,7 +28,8 @@ SECRET_KEY = &quot;&lt;%= File.read(&#39;/etc/colab/secret.key&#39;).strip %&gt;&quot;
 SITE_URL = "<%= node['config']['site_url'] %>"
-ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>",
+                 "<%= node['config']['sisp_external_hostname'] %>"]
 ## Disable indexing
 ROBOTS_NOINDEX = False
@@ -5,18 +5,20 @@ upstream colab {
 server {
   listen                *:80;
-  server_name           <%= node['config']['external_hostname'] %>;
+  server_name           <%= node['config']['external_hostname'] %> <%= node['config']['sisp_external_hostname'] %>;
   access_log            /var/log/nginx/colab.access.log;
   error_log             /var/log/nginx/colab.error.log;
-  client_max_body_size  150m;
+  client_max_body_size  0;
+  # FIXME: Favico should be at right place and this
+  #     code should be removed.
   location ~ ^/static/img/fav\.[^.]+\.ico$ {
     alias /var/lib/colab/assets/spb/fav.ico;
   }
   location / {
-    root  /usr/share/nginx/colab;
+    root  /var/lib/colab/assets/;
     try_files $uri @colab-app;
   }
 production:
-  max_upload_size: 150MB
+  max_upload_size: 500MB
@@ -6,11 +6,11 @@ upstream noosfero {
 server {
   listen *:80;
-  server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %>;
+  server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %> <%= node['config']['sisp_external_hostname'] %>;
   underscores_in_headers  on;
   access_log            /var/log/nginx/noosfero.access.log;
   error_log             /var/log/nginx/noosfero.error.log;
-  client_max_body_size  150m;
+  client_max_body_size  0;
   root /usr/lib/noosfero/public;
   location /social/ {
@@ -24,7 +24,7 @@ server {
     proxy_read_timeout      90;
     proxy_connect_timeout   90;
     proxy_redirect          off;
-    proxy_set_header        Host <%= node['config']['external_hostname'] %>;
+    proxy_set_header        Host $host;
     proxy_set_header        X-Real-IP $remote_addr;
     proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
   }
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEgTCCA2mgAwIBAgIJAJz0XkZVg/KTMA0GCSqGSIb3DQEBCwUAMIHWMQswCQYD
+VQQGEwJCUjEZMBcGA1UECAwQRGlzdHJpdG8gRmVkZXJhbDERMA8GA1UEBwwIQnJh
+c2lsaWExPTA7BgNVBAoMNE1pbmlzdGVyaW8gZG8gUGxhbmVqYW1lbnRvLCBPcsOD
+wqdhbWVudG8gZSBHZXN0w4PCo28xDTALBgNVBAsMBFNMVEkxIzAhBgNVBAMMGmRl
+di5zb2Z0d2FyZXB1YmxpY28uZ292LmJyMSYwJAYJKoZIhvcNAQkBFhdwYXVsb0Bz
+b2Z0d2FyZWxpdnJlLm9yZzAeFw0xNTAzMTIxOTQ3NTdaFw0xNzEyMDYxOTQ3NTda
+MIHWMQswCQYDVQQGEwJCUjEZMBcGA1UECAwQRGlzdHJpdG8gRmVkZXJhbDERMA8G
+A1UEBwwIQnJhc2lsaWExPTA7BgNVBAoMNE1pbmlzdGVyaW8gZG8gUGxhbmVqYW1l
+bnRvLCBPcsODwqdhbWVudG8gZSBHZXN0w4PCo28xDTALBgNVBAsMBFNMVEkxIzAh
+BgNVBAMMGmRldi5zb2Z0d2FyZXB1YmxpY28uZ292LmJyMSYwJAYJKoZIhvcNAQkB
+FhdwYXVsb0Bzb2Z0d2FyZWxpdnJlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANUAsaDZ77GHyrlWDet+I2Xq8Sf31j3ponMXzMd/6zAu6NSDcZjl
+LPrFEqfqBVdY3T1L5THDHG42ZS6n0FHsOTBq2JKswlcTSPyaHiweRI+lEMVzRcgm
+GshtJnTWukMsDvOGwVe6zkcKWl5vG2KKgTrI0l+QnCbCP10UNqwTCl2gN5l0piDl
+rTiBwRbfn1wdGd9JgQr+MQrMhPnE31vsSA8G5p0KUX4oxYgmKmMykutqJIia7LeF
+VQtMuRZbfz/HwtUtFuAa3ztBQiKmoZlrh1k/akm3YhBiramtAXEt7aHI6HY3X0pw
+l7AE7MHOutCfoshEHZToZNJiyXpDATIIwfsCAwEAAaNQME4wHQYDVR0OBBYEFDVm
+z5gED6aHPs1H9DdqUfGIY0vfMB8GA1UdIwQYMBaAFDVmz5gED6aHPs1H9DdqUfGI
+Y0vfMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBANNc+ZD4ImQI8V2Y
+2lkRnRQvQ7M2mdAgRaP5f4EJLLlczmRPzNhItiYr9njg8pUdN50iQPnvwlDJhI5d
+mFuDypY1AhLB74sSDk7Um3gFP5rAlKdD9WrmKA3FSfGcUJA2Usa+6NnudBmm1Uvn
+yLGpOCSnxQfTZ+81XanI9Sy6kV/6Nwpaid9akmm3aIUtJA0thC0OWEhHMY97vqBF
+7or8IKooXxIx4jNbholJXQ2zD5tc5nDfBwB9DFBX7LeXRqZQE4T0eUOhF/shoRnG
+gFSMN8Vjhw8eV7wPvxX6aX8kZmfZgAF1m4EzEaDLs2iL7dVkPxO7SSlXqkg0nLuH
+RWIj+F0=
+-----END CERTIFICATE-----
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVALGg2e+xh8q5
+Vg3rfiNl6vEn99Y96aJzF8zHf+swLujUg3GY5Sz6xRKn6gVXWN09S+UxwxxuNmUu
+p9BR7DkwatiSrMJXE0j8mh4sHkSPpRDFc0XIJhrIbSZ01rpDLA7zhsFXus5HClpe
+bxtiioE6yNJfkJwmwj9dFDasEwpdoDeZdKYg5a04gcEW359cHRnfSYEK/jEKzIT5
+xN9b7EgPBuadClF+KMWIJipjMpLraiSImuy3hVULTLkWW38/x8LVLRbgGt87QUIi
+pqGZa4dZP2pJt2IQYq2prQFxLe2hyOh2N19KcJewBOzBzrrQn6LIRB2U6GTSYsl6
+QwEyCMH7AgMBAAECggEAa2w6KUFAXWx6lRYNVyL6f0AJ93pKllbqEtmB8WtWFarS
+ybqw48dQ8/fH/N9Nakvq6CsKoBoikILmbK09ptNX1E9OgkqWiIu1V4/yf5WURk2d
+M7d7DgIJp+NEbdCNh6sEr1Ta1X/k4HccNFwcl4n6usblMkUgO3vjsPGs0QOZSrXD
+NDp4ixdElxyuZPZnRkrry4JZzm0Jad/kNw0naz0S+YLqysJNOD1kepN+DAlap5WE
+oEfvmkLgrTDnjar8cK3i/EzbzNxWxLo89IdbbnpPV3m/SSQO7p689uL+VkZxLz0I
+uzVg6TZ1jQ5+IWjKL0Aqt5xkStaZp2uh8vlNw/0IQQKBgQDwBVtI+2ASacuu6eJL
+RTWalTPH/jr9mA0Ism2Px5hdI7vugJ3NJY0fIRTzRU53MFfRXZIcpYf+60stYhiX
+QBmF/DukxtUL4naOz2VzkY5RcKnfsvUff65KGaCdHzWQQsL93qEjpusRMQwhGErt
+vgKsbjgyHaVbVLGNZuFYoNLzkwKBgQDjLt6d8p7rR2e89sQKuE0B43UiuL/rDY1n
+OC411KwqsKFX3J/ias4NIy/h1BEag+Ron9SMRAlVoPg+2aLmywZp4KijcFxSLUFI
+2fWtoRXEyAOgz61I9SonGvBQLCLAZ+24VpoymmMNdH/xbeoysRCxovPw3NPnFfzB
+xYfiRpXI+QKBgE9v1mhvGbq+XPUE3yo+O6Fvo/WaxHdNrXKlavFdA6Y/v2EOHCvb
+M7uLvV1OIMv9qfLW3xawCjRqNzVL9AuK4WegtTSxwazvRIG7Tj5TfCCkAvTQS6Qj
+I9HObYPS4m1eSx6uYfJkugO0kekaGyJX8paS2/JqMWHqw+Cing4xG+AVAoGBAKx2
+DStMXpXve/H4RnR42oS/flGgfJjcjea4wGO/Ef/KXIENjBZezBMvDg9aZK2DSGag
+RsNAdvGZJDraDo8zuqevk3WXO45qqm+6foWTjqn2yMJQRZToAFr1WU8TYkI74zuY
+CrC1gNJbCTFnJm3a+vhO4u6LRRXdHCahZHlC6jxJAoGARpcsSUSXqWOsmCvP+d0I
+m3B7DTJc0fL7WOoXINSa1U4zr9vMfSxTdWBdlKmizDvzzz9+Rx+03TGQkqzroTk/
+eWZuPuJ74qXkT68JCoCmf6MBolIkWqkDO5zKlQF3hkb3c16mOKCqzQpXLGtoZQRG
+PH+5xM1maQvJxF5tCVQz0uU=
+-----END PRIVATE KEY-----
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEjzCCA3egAwIBAgIJAPLzeW3WZTOqMA0GCSqGSIb3DQEBCwUAMIHdMQswCQYD
+VQQGEwJCUjEZMBcGA1UECAwQRGlzdHJpdG8gRmVkZXJhbDERMA8GA1UEBwwIQnJh
+c2lsaWExIzAhBgNVBAoMGk1pbmlzdGVyaW8gZG8gUGxhbmVqYW1lbnRvMS0wKwYD
+VQQLDCRQcm9ncmFtYSBTb2Z0d2FyZSBQdWJsaWNvIEJyYXNpbGVpcm8xJDAiBgNV
+BAMMG2JldGEuc29mdHdhcmVwdWJsaWNvLmdvdi5icjEmMCQGCSqGSIb3DQEJARYX
+cGF1bG9Ac29mdHdhcmVsaXZyZS5vcmcwHhcNMTUwMjEyMTM0MDEwWhcNMTcxMTA4
+MTM0MDEwWjCB3TELMAkGA1UEBhMCQlIxGTAXBgNVBAgMEERpc3RyaXRvIEZlZGVy
+YWwxETAPBgNVBAcMCEJyYXNpbGlhMSMwIQYDVQQKDBpNaW5pc3RlcmlvIGRvIFBs
+YW5lamFtZW50bzEtMCsGA1UECwwkUHJvZ3JhbWEgU29mdHdhcmUgUHVibGljbyBC
+cmFzaWxlaXJvMSQwIgYDVQQDDBtiZXRhLnNvZnR3YXJlcHVibGljby5nb3YuYnIx
+JjAkBgkqhkiG9w0BCQEWF3BhdWxvQHNvZnR3YXJlbGl2cmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvQcGwjcDku+162qWFXvfD3VzK+qonEIo
+EWimjFgxkBIsbKQ6WurTg6jTdT7TCyz0bfXgNPUo2tTfOtyM2ctb/oCfu5Piu3hK
+TU71/oswUWCMnPwaGhvJ7wWFrkClLNS3MYzlbGAxuLtX8KEcCSOR0109xvVMb+LD
+kAUmHij1DfI9XguYS4J2xQ+aDCHZRzRxMPV7If75HtoeZ7y8bieqFL9T1+atsvbS
+WuoYaJFKiW859h6Fwo/0wfkv8gSaGulSwnS2esMPfEm97QfmWbgEqq/XFkrKWtPo
+ENNY8WlGFDMWdur7dlQwazjG9+OK5h3X84qDfYhzY4GPh1O+2WDudwIDAQABo1Aw
+TjAdBgNVHQ4EFgQUzu9xzlM0W3YmELPcUvNlfpYcndQwHwYDVR0jBBgwFoAUzu9x
+zlM0W3YmELPcUvNlfpYcndQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AQEAaQKLFZaqLRS493o4cyJsz1mxBgbzQ+6vttEPmY1/yW391h9rBXDTlpqRt22z
++CNDzo7L2LQjlrvvqk/ByDl5xWw4z9Qy+OFGFVGDVPvhld00/7QNnqkwyYbqWghN
+M0m/BZp59Bpm+eRHG1HIw0jpA/zfgVqUjoIgPWWnGJLtJh4l+GOAxwTdJh0Vp/1Q
+yYiI6NRufr8+lUStojY27dC94WLX2dCUAS0imvdONWiaCZ8ktq4D3AGkni5wUVH1
+knap5Bf5FRnKCTnRmZe1Wi+e2ZIMDdW4gHsC5NKO38c4agWubE68yhYiFKMRLWsd
+fLq+KLdrwb++Xd0SECj/hsQYLQ==
+-----END CERTIFICATE-----
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9BwbCNwOS77Xr
+apYVe98PdXMr6qicQigRaKaMWDGQEixspDpa6tODqNN1PtMLLPRt9eA09Sja1N86
+3IzZy1v+gJ+7k+K7eEpNTvX+izBRYIyc/BoaG8nvBYWuQKUs1LcxjOVsYDG4u1fw
+oRwJI5HTXT3G9Uxv4sOQBSYeKPUN8j1eC5hLgnbFD5oMIdlHNHEw9Xsh/vke2h5n
+vLxuJ6oUv1PX5q2y9tJa6hhokUqJbzn2HoXCj/TB+S/yBJoa6VLCdLZ6ww98Sb3t
+B+ZZuASqr9cWSspa0+gQ01jxaUYUMxZ26vt2VDBrOMb344rmHdfzioN9iHNjgY+H
+U77ZYO53AgMBAAECggEAXM+AYAeG97Q+zDHvMuk5Imv2eo+i7eYFqlaJv8rluulR
+ap5QEKfP5osUGDMaiBgwg3T/+sCMqLVwTYRQm/cfWhxpUT5RSt7LDJ5CZhKNTMdt
+Av89CaivQ26grmgLMbHXqLqXQtkQULWbfgh8rXgLd44GcROrzhu3DZWZm6FcgNWf
+0/NpruEkxyqvCGygOOPR8IMlMGuCs+CUcVuDL5InrobroKTrWgWXOW8k+XJpaINz
+5udLgdTAfRWecuJkFvfA71JZJXpnyTSx2je16SwnA6bhaQCSuK4myXiOVacPUOhM
+PZ2/gcZbuB16vFlNMhQUjvzFKMvH96R+PrYuG7BGYQKBgQD5gZwKuc3cat17ghpB
+WSl3njBrqiCMvTYeec6anfTB0bSs9z8LoCwRdLATw9AAPfFuXnxzBNzTEK3GBnW6
+slYeDrhrOKz4uilHnXdSGXu0vOgjn5AzuHtnNUc2Eyx3qe2RxXJZ5Y/ADhJNCTIU
+GFTBak/FLFrMOvxPtFaluP4VKQKBgQDB8naaziF42y254+JzbshMlLffRpnubk/X
+Xxvntjh7dCPCS+jrARM0XGHnrhFyDOODny55EyRzYip2+r80PN4N5rzQuaIFOhh7
+aT/X2hFBFcAmiWCUTRXCRdNTZYGFNOQ+A9xrR375Ltqu3w1K/RB2QEfWYPR+KLEe
+QdtHmuK6nwKBgQCVeITflBH0cvy+SeGqtlx2MYk2ZpPbXFq4hSY1UF1ZY2TGndPi
+BhGAX5RAMvU/v9wLz4TkbsxPkVVZJXOP5dhbZ1wpt6k/1F54bagWwfdu/iBffu6n
+XWRoHu3LQk9IXL9arZtkqXalioiCJ/kdOrpDqImjSIAYi1mt8g5ad2mXiQKBgHdy
+Bk2s6bxu8ChuCscg0UcoyF1ANAk98vonXx5DgWG201cUPSyOiu9SfhGbiK7+9RfY
+71wtx+Mv8As6votDeVaCZoL98KTbdLx8w48ChGHbLW4OaWasWtw8+LuB5lTNkEwJ
+QLTpYW/BxXixcpReascJK7UCHVGdagfCc3QUFdLtAoGBAPN9+2/W990bWNLlEncB
+tMq89b/pOGhy9u+CN2pgKmBBkL5M8ESyYDUKM7wn+DlilpcYvadlR9gfk4gaCQQ4
+DLHGFGfvVN1CRuIU0YAgaLMNveVV/6Dd7D8/OxYxKlCrFZaUfVe2HcVPbm+w4tZf
+2HfXJdbD1gNhbTmWlKjFLdA1
+-----END PRIVATE KEY-----
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEjzCCA3egAwIBAgIJAPLzeW3WZTOqMA0GCSqGSIb3DQEBCwUAMIHdMQswCQYD
+VQQGEwJCUjEZMBcGA1UECAwQRGlzdHJpdG8gRmVkZXJhbDERMA8GA1UEBwwIQnJh
+c2lsaWExIzAhBgNVBAoMGk1pbmlzdGVyaW8gZG8gUGxhbmVqYW1lbnRvMS0wKwYD
+VQQLDCRQcm9ncmFtYSBTb2Z0d2FyZSBQdWJsaWNvIEJyYXNpbGVpcm8xJDAiBgNV
+BAMMG2JldGEuc29mdHdhcmVwdWJsaWNvLmdvdi5icjEmMCQGCSqGSIb3DQEJARYX
+cGF1bG9Ac29mdHdhcmVsaXZyZS5vcmcwHhcNMTUwMjEyMTM0MDEwWhcNMTcxMTA4
+MTM0MDEwWjCB3TELMAkGA1UEBhMCQlIxGTAXBgNVBAgMEERpc3RyaXRvIEZlZGVy
+YWwxETAPBgNVBAcMCEJyYXNpbGlhMSMwIQYDVQQKDBpNaW5pc3RlcmlvIGRvIFBs
+YW5lamFtZW50bzEtMCsGA1UECwwkUHJvZ3JhbWEgU29mdHdhcmUgUHVibGljbyBC
+cmFzaWxlaXJvMSQwIgYDVQQDDBtiZXRhLnNvZnR3YXJlcHVibGljby5nb3YuYnIx
+JjAkBgkqhkiG9w0BCQEWF3BhdWxvQHNvZnR3YXJlbGl2cmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvQcGwjcDku+162qWFXvfD3VzK+qonEIo
+EWimjFgxkBIsbKQ6WurTg6jTdT7TCyz0bfXgNPUo2tTfOtyM2ctb/oCfu5Piu3hK
+TU71/oswUWCMnPwaGhvJ7wWFrkClLNS3MYzlbGAxuLtX8KEcCSOR0109xvVMb+LD
+kAUmHij1DfI9XguYS4J2xQ+aDCHZRzRxMPV7If75HtoeZ7y8bieqFL9T1+atsvbS
+WuoYaJFKiW859h6Fwo/0wfkv8gSaGulSwnS2esMPfEm97QfmWbgEqq/XFkrKWtPo
+ENNY8WlGFDMWdur7dlQwazjG9+OK5h3X84qDfYhzY4GPh1O+2WDudwIDAQABo1Aw
+TjAdBgNVHQ4EFgQUzu9xzlM0W3YmELPcUvNlfpYcndQwHwYDVR0jBBgwFoAUzu9x
+zlM0W3YmELPcUvNlfpYcndQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AQEAaQKLFZaqLRS493o4cyJsz1mxBgbzQ+6vttEPmY1/yW391h9rBXDTlpqRt22z
++CNDzo7L2LQjlrvvqk/ByDl5xWw4z9Qy+OFGFVGDVPvhld00/7QNnqkwyYbqWghN
+M0m/BZp59Bpm+eRHG1HIw0jpA/zfgVqUjoIgPWWnGJLtJh4l+GOAxwTdJh0Vp/1Q
+yYiI6NRufr8+lUStojY27dC94WLX2dCUAS0imvdONWiaCZ8ktq4D3AGkni5wUVH1
+knap5Bf5FRnKCTnRmZe1Wi+e2ZIMDdW4gHsC5NKO38c4agWubE68yhYiFKMRLWsd
+fLq+KLdrwb++Xd0SECj/hsQYLQ==
+-----END CERTIFICATE-----
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9BwbCNwOS77Xr
+apYVe98PdXMr6qicQigRaKaMWDGQEixspDpa6tODqNN1PtMLLPRt9eA09Sja1N86
+3IzZy1v+gJ+7k+K7eEpNTvX+izBRYIyc/BoaG8nvBYWuQKUs1LcxjOVsYDG4u1fw
+oRwJI5HTXT3G9Uxv4sOQBSYeKPUN8j1eC5hLgnbFD5oMIdlHNHEw9Xsh/vke2h5n
+vLxuJ6oUv1PX5q2y9tJa6hhokUqJbzn2HoXCj/TB+S/yBJoa6VLCdLZ6ww98Sb3t
+B+ZZuASqr9cWSspa0+gQ01jxaUYUMxZ26vt2VDBrOMb344rmHdfzioN9iHNjgY+H
+U77ZYO53AgMBAAECggEAXM+AYAeG97Q+zDHvMuk5Imv2eo+i7eYFqlaJv8rluulR
+ap5QEKfP5osUGDMaiBgwg3T/+sCMqLVwTYRQm/cfWhxpUT5RSt7LDJ5CZhKNTMdt
+Av89CaivQ26grmgLMbHXqLqXQtkQULWbfgh8rXgLd44GcROrzhu3DZWZm6FcgNWf
+0/NpruEkxyqvCGygOOPR8IMlMGuCs+CUcVuDL5InrobroKTrWgWXOW8k+XJpaINz
+5udLgdTAfRWecuJkFvfA71JZJXpnyTSx2je16SwnA6bhaQCSuK4myXiOVacPUOhM
+PZ2/gcZbuB16vFlNMhQUjvzFKMvH96R+PrYuG7BGYQKBgQD5gZwKuc3cat17ghpB
+WSl3njBrqiCMvTYeec6anfTB0bSs9z8LoCwRdLATw9AAPfFuXnxzBNzTEK3GBnW6
+slYeDrhrOKz4uilHnXdSGXu0vOgjn5AzuHtnNUc2Eyx3qe2RxXJZ5Y/ADhJNCTIU
+GFTBak/FLFrMOvxPtFaluP4VKQKBgQDB8naaziF42y254+JzbshMlLffRpnubk/X
+Xxvntjh7dCPCS+jrARM0XGHnrhFyDOODny55EyRzYip2+r80PN4N5rzQuaIFOhh7
+aT/X2hFBFcAmiWCUTRXCRdNTZYGFNOQ+A9xrR375Ltqu3w1K/RB2QEfWYPR+KLEe
+QdtHmuK6nwKBgQCVeITflBH0cvy+SeGqtlx2MYk2ZpPbXFq4hSY1UF1ZY2TGndPi
+BhGAX5RAMvU/v9wLz4TkbsxPkVVZJXOP5dhbZ1wpt6k/1F54bagWwfdu/iBffu6n
+XWRoHu3LQk9IXL9arZtkqXalioiCJ/kdOrpDqImjSIAYi1mt8g5ad2mXiQKBgHdy
+Bk2s6bxu8ChuCscg0UcoyF1ANAk98vonXx5DgWG201cUPSyOiu9SfhGbiK7+9RfY
+71wtx+Mv8As6votDeVaCZoL98KTbdLx8w48ChGHbLW4OaWasWtw8+LuB5lTNkEwJ
+QLTpYW/BxXixcpReascJK7UCHVGdagfCc3QUFdLtAoGBAPN9+2/W990bWNLlEncB
+tMq89b/pOGhy9u+CN2pgKmBBkL5M8ESyYDUKM7wn+DlilpcYvadlR9gfk4gaCQQ4
+DLHGFGfvVN1CRuIU0YAgaLMNveVV/6Dd7D8/OxYxKlCrFZaUfVe2HcVPbm+w4tZf
+2HfXJdbD1gNhbTmWlKjFLdA1
+-----END PRIVATE KEY-----
@@ -6,6 +6,13 @@ cookbook_file &quot;/etc/nginx/#{node[&#39;config&#39;][&#39;external_hostname&#39;]}.crt&quot; do
   notifies :restart, 'service[nginx]'
 end
+cookbook_file "/etc/nginx/#{node['config']['sisp_external_hostname']}.crt" do
+  owner 'root'
+  group 'root'
+  mode 0600
+  notifies :restart, 'service[nginx]'
+end
+
 cookbook_file "/etc/sysctl.d/ip_forward.conf" do
   owner 'root'
   group 'root'
@@ -23,6 +30,13 @@ cookbook_file &quot;/etc/nginx/#{node[&#39;config&#39;][&#39;external_hostname&#39;]}.key&quot; do
   notifies :restart, 'service[nginx]'
 end
+cookbook_file "/etc/nginx/#{node['config']['sisp_external_hostname']}.key" do
+  owner 'root'
+  group 'root'
+  mode 0600
+  notifies :restart, 'service[nginx]'
+end
+
 template '/etc/nginx/conf.d/reverse_proxy.conf' do
   owner 'root'
   group 'root'
@@ -5,15 +5,15 @@ upstream colab {
 server {
   listen                *:80;
-  server_name           <%= node['config']['external_hostname'] %>;
-  return                301 https://$server_name$request_uri;
+  server_name           <%= node['config']['external_hostname'] %> <%= node['config']['sisp_external_hostname'] %>;
+  return                301 https://$host$request_uri;
 }
 server {
   listen                *:443 ssl;
   server_name           <%= node['config']['external_hostname'] %>;
-  client_max_body_size  150m;
+  client_max_body_size  500m;
   ssl on;
@@ -47,3 +47,38 @@ server {
   }
 }
+
+server {
+  listen                *:443 ssl;
+
+  server_name           <%= node['config']['sisp_external_hostname'] %>;
+  client_max_body_size  500m;
+
+  ssl on;
+
+  ssl_certificate           /etc/nginx/<%= node['config']['sisp_external_hostname'] %>.crt;
+  ssl_certificate_key       /etc/nginx/<%= node['config']['sisp_external_hostname'] %>.key;
+  ssl_session_cache         shared:SSL:10m;
+  ssl_session_timeout       5m;
+  ssl_protocols             SSLv3 TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers               HIGH:!aNULL:!MD5;
+  ssl_prefer_server_ciphers on;
+
+  access_log            /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.access.log;
+  error_log             /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.error.log;
+
+  # TODO caching
+  location / {
+    proxy_pass              http://colab;
+    proxy_read_timeout      90;
+    proxy_connect_timeout   90;
+    proxy_redirect          off;
+    proxy_set_header        Host $host;
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto https;
+    proxy_set_header        Remote-User '';
+    proxy_set_header        REMOTE_USER '';
+  }
+
+}
@@ -68,23 +68,22 @@ O output do comando acima é a sua chave pública, ela deverá ser copiada e col
 Git push com HTTPS
 -----------------
-Para a utilização do git com protocolo HTTPS é necessário configurar a senha do perfil do seu usuário na ferramenta Gitlab, pois a senha do seu usuário do portal não é configurada no Gitlab já que a autenticação é feita via REMOTE_USER (cabeçalho HTTP). Para configurar a sua senha no Gitlab é necessário que já exista um usuário válido no portal e o mesmo esteja logado, em seguida, siga os passos a seguir:
+Para a utilização do git com protocolo HTTPS, existem dois casos básicos: aqueles que já tinham cadastro e os novos usuários. Se for o primeiro cadastro, pule o passo "0" descrito abaixo.
-1- No menu, clique no botão "Desenvolvimento" para que apareça novas opções
-2- Nas opções apresentadas, clique em "Perfil" para ser direcionado para o seu perfil do Gitlab
-3- No seu perfil será apresentado um novo menu abaixo do menu do portal, nesse menu clique na aba "Password"
-4- Na aba "Password", indique que você esqueceu a sua senha clicando no link "Forgot your password?"
-5- Um email será enviado para o seu endereço de email configurado no seu usuário do portal
-6- Abra o email recebido e clique no link "Change my password", que irá redirecionar para uma página de configuração de uma nova senha
-7- Na página de configuração de uma nova senha digite a sua senha e a confirme (sugere-se que use a mesma senha do portal), finalizando a operação de configuração da senha do seu perfil no Gitlab
+0) Mudar senha no colab (para usuários já cadastrados): No topo da tela, do lado direito, você verá um icone circular no qual você deve clicar. Na nova tela apresentada, escolha a opção "Meu perfil" e em seguida escolha a opção "Editar Perfil". Na nova tela, clique na opção "Trocar senha". Digite a sua senha original, e a nova senha.
+1) Para clonar o repositório via http, use o comando abaixo:
-Com a senha do seu perfil do Gitlab configurada pode-se utlizar normalmente o git com protocolo HTTPS, onde será solcitado o seu usuário e senha durante as operações. Lembrando que o usuário será o seu usuário do portal e a senha será a que foi configurada com o processo descrito anteriormente.
+  $ git -c http.sslVerify=false clone <seu-repositório>
-No Portal do Software Público Brasileiro, assim como em outros portais do governo, temos problemas com o certificado digital. Para o git conseguir realizar as operções usando HTTPS é necessário ignorar o certificado, para isso, abra o terminal (com o git instalado) e execute o seguinte comando::
+2) Para realizar o push via http, faça:
   $ cd <caminho-do-diretório-do-projeto>
   $ git config http.sslVerify "false"
+  $ git push <remote> <branch>
+3) Informe o seu login e senha.
+
+No Portal do Software Público Brasileiro, assim como em outros portais do governo, temos problemas com o certificado digital. Para o git conseguir realizar as operações usando HTTPS é necessário ignorar o certificado, por isto as opções com "sslVerify".
 Integração manual entre repositórios
 ---------------------------------
@@ -15,7 +15,7 @@ version = open(&#39;VERSION&#39;).read().strip()
 setup(
     name='colab-spb-plugin',
-    version=version,
+    version='0.2.3',
     author='Macartur Sousa',
     author_email='macartur.sc@gmail.com',
     url='https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-plugin/',
 PACKAGE = colab-spb-theme
-VERSION = $(shell cat VERSION)
+VERSION = 0.3.4
 DISTDIR = dist
 PACKAGE_NAME = $(PACKAGE)-$(VERSION)
 TARBALL = $(PACKAGE_NAME).tar.gz
@@ -10,7 +10,7 @@ all:
 colab_dir=/usr/lib/colab
 dist: clean
-	mkdir -p $(DISTDIR)/$(PACKAGE_NAME)
+	mkdir -p $(DISTDIR)/$(PACKAGE_NAME) 
 	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR)/$(PACKAGE_NAME) && tar xf -)
 	cd $(DISTDIR) &&  tar -czf $(TARBALL) $(PACKAGE_NAME)
 	rm -r $(DISTDIR)/$(PACKAGE_NAME)
@@ -168,14 +168,9 @@ ul.message-list li {
 /* Forms */
-.required label:before {
-    color: #f00;
-    content: "* ";
-}
-
 form.signup .form-group {
-    width: 90%;
-    margin-left: 0.5em;
+    margin-left: 0px;
+    margin-right: 22px;
 }
 div.submit {
@@ -517,3 +512,79 @@ span.highlighted {
     padding: 40px 0 60px 0;
     color: #172738;
 }
+
+.colab-content {
+    max-width: 960px;
+    min-width: 960px;
+    padding: 40px 0 60px 0;
+}
+
+.colab-content h2{
+    color: #FF0366;
+    font-size: 16px;
+    font-family: "open_sansregular",Arial, Helvetica,sans-serif;
+    font-weight: 300;
+    text-transform: uppercase;
+}
+
+.colab-content h1{
+    padding: 5px 0 10px 0;
+    border-bottom: 1px solid #D3D6DE;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 35px;
+    font-variant: normal;
+    font-weight: bold;
+}
+
+h4.help-pane-title {
+    font-family: Arial;
+    color: #172738;
+}
+
+#btn-cadastrar {
+    text-transform: uppercase;
+    font-weight: bold;
+    padding: 5px 27px 5px 27px;
+}
+
+.control-label {
+    font-family: Arial;
+    font-weight: normal;
+    font-size: 16px;
+}
+
+form.signup {
+    padding-top: 30px;
+}
+
+.signup .form-group:nth-child(5),
+.signup .form-group:nth-child(6) {
+    width: 45%;
+}
+
+.signup .form-group:nth-child(5) {
+    float: left;
+}
+
+.signup .form-group:nth-child(6) {
+    float: right;
+}
+
+.signup div.form-group.alert {
+    padding: 0px 10px 10px 10px;
+}
+
+.signup div.form-group.alert ul.errorlist {
+    padding-left: 15px;
+}
+
+.signup-help {
+    font-size: 16px;
+    font-family: Arial;
+    padding-top: 7px;
+
+  }
+
+a.btn {
+  margin: 2px 0 2px 0;
+}
-.search-form {
+.colab-search-form {
     margin-top: 28px;
     padding-top: 0px;
     padding-bottom: 15px;
@@ -10,7 +10,7 @@
     border: 1px solid #d3d6de;
 }
-.search-title {
+.colab-search-title {
     color: #3e67b1;
     margin: 5px 0px 3px;
     padding: 16px 0px 0px 0px;
@@ -20,7 +20,7 @@
     text-transform: uppercase;
 }
-.search-input {
+.colab-search-input {
     width: 100%;
     padding: 7px;
     font-size: 14px;
@@ -30,7 +30,7 @@
     border: 1px solid #d3d6de;
 }
-.search-blue {
+.colab-search-blue {
     background: #3e67b1;
     color: white;
     width: auto;
@@ -43,6 +43,21 @@
     font-size: 14px;
 }
+.colab-search-results div.container div.row h4 a {
+    font-size: 19px;
+    font-weight: 700;
+    line-height: 21px;
+}
+
+.colab-search-results div.container div.row a {
+    color: #172738;
+    text-decoration: none;
+}
+
+.colab-search-results div.container div.row a:hover {
+    text-decoration: none;
+}
+
 .btn:hover {
     color: white;
 }
@@ -59,4 +74,9 @@
     font-size: 14px;
     font-family: Arial;
     font-weight: bold;
-}
 \ No newline at end of file
+}
+
+.colab-result-register {
+    display: block;
+    padding-top: 40px;
+}
@@ -0,0 +1,45 @@
+{% extends 'base.html' %}
+{% load i18n gravatar %}
+
+{% block main-content %}
+  <div class="colab-content container">
+    <h2>Inscreva-se nas listas de discussão</h2>
+    <h3>{% gravatar user_.email 50 %} {{ user_.get_full_name }} ({{ user_.username }})</h3>
+    <br>
+
+    <form method='post'>
+      {% csrf_token %}
+
+      <div class="row">
+        {% for email, lists in membership.items %}
+        <div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h3 class="panel-title">{{ email }}</h3>
+            </div>
+            <div class="panel-body">
+              {% for list, checked in lists %}
+                <div class="checkbox" title="{{ list.description }}">
+                  <label>
+                    <input name="{{ email }}" value="{{ list.listname }}" type="checkbox" {% if checked %}checked{% endif%}>{{ list.listname }}</input>
+                  </label>
+                </div>
+              {% endfor %}
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+
+      <div class="row">
+        <div class="col-md-12">
+          <button class="btn btn-lg btn-primary" type="submit">{% trans 'Update subscriptions' %}</button>
+        </div>
+      </div>
+
+    </form>
+
+    <br><br>
+    <br><br>
+  </div>
+{% endblock %}
@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block main-content %}
+<div class="colab-content container">
+  <h2>Cadastre-se</h2>
+  <h1>Informações pessoais</h1>
+
+  <form action="{% url "signup" %}" method="post" role="form" class="form-horizontal signup">
+    {% csrf_token %}
+    <div class="row">
+      <div class="col-md-6 col-lg-6 col-sm-6 col-xs-12">
+          <fieldset>
+            {% for field in user_form %}
+              <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
+                <label for="{{ field.name }}" class="control-label">
+                  {{ field.label }}
+                </label>
+                {{ field }}
+                {{ field.errors }}
+              </div>
+            {% endfor %}
+          </fieldset>
+
+          <input type="submit" value="Cadastrar" id="btn-cadastrar" class="btn btn-primary">
+      </div>
+      <div class="col-md-6 col-lg-6 col-sm-6 col-xs-12">
+        <div style="border-left: 1px solid #ccc; padding-left: 52px; min-height: 450px">
+          <div class="signup-help">
+            <p>Em caso de dúvidas visite a seção de <a href="/social/spb/ajuda#faq">Ajuda</a></p>
+            <hr>
+            <p>Caso ainda permaneça com dúvidas, fique à vontade para entrar em contato conosco através do email <a href="mailto:admin@softwarepublico.gov.br">admin@softwarepublico.gov.br</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </form>
+</div>
+{% endblock %}
@@ -0,0 +1,164 @@
+{% extends "base.html" %}
+
+{% load i18n gravatar %}
+
+{% block title %}Perfil{% endblock %}
+
+{% block head_js %}
+  {% trans "Messages" as group_collabs %}
+  {% trans "Contributions" as type_collabs %}
+
+  {% include "doughnut-chart.html" with chart_data=type_count chart_canvas="collabs" name=type_collabs %}
+  {% include "doughnut-chart.html" with chart_data=list_activity chart_canvas="collabs2" name=group_collabs %}
+{% endblock %}
+
+{% block main-content %}
+  <div class="colab-content container">
+    <div id="user-profile" class="row">
+      <div class="colab-vcard col-lg-4 col-md-4 col-sm-5">
+        <div class="thumbnail">
+          {% gravatar user_.email 200 %}
+        </div>
+
+        <h1>
+          <span>{{ user_.get_full_name }}</span>
+          <em>{{ user_.username }}</em>
+        </h1>
+
+        {% if request.user == user_ or request.user.is_superuser %}
+          <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "edit profile"|title %}</a>
+          <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;Inscreva-se nas listas de discussão</a>
+        {% endif %}
+
+        {% if request.user.is_active %}
+          {% if user_.bio %}
+            <div class="divider"></div>
+            <ul class="unstyled-list">
+              <li>
+                <strong>{% trans 'Bio' %}</strong>
+              </li>
+              <li class="text-muted"> {{ user_.bio }}</li>
+            </ul>
+          {% endif %}
+        {% endif %}
+
+        <div class="divider"></div>
+        {% if request.user.is_active %}
+          <ul class="unstyled-list">
+            <li><span class="icon-envelope icon-fixed-width"></span> <a href="mailto:{{ user_.email }}">{{ user_.email }}</a></li>
+          </ul>
+          <div class="divider"></div>
+        {% endif %}
+
+        <ul class="unstyled-list">
+          {% if user_.institution or user_.role %}
+            <li>
+              <span class="icon-briefcase icon-fixed-width"></span>
+              {{ user_.role }}
+              {% if user_.institution and user_.role %}-{% endif %}
+              {{ user_.institution }}
+            </li>
+          {% endif %}
+          {% if request.user.is_active %}
+            {% if SOCIAL_NETWORK_ENABLED %}
+              <li>
+                {% if user_.twitter %}
+                  <span class="icon-twitter icon-fixed-width" title="{% trans 'Twitter account' %}"></span> <a target="_blank" href="{{ user_.twitter_link }}" title="{% trans 'Twitter account' %}">{{ user_.twitter }}</a>
+                {% endif %}
+                {% if user_.facebook %}
+                  <span class="icon-facebook icon-fixed-width" title="{% trans 'Facebook account' %}"></span> <a target="_blank" href="{{ user_.facebook_link }}" title="{% trans 'Facebook account' %}">{{ user_.facebook }}</a>
+                {% endif %}
+              </li>
+
+              {% if user_.google_talk %}
+                <li><span class="icon-google-plus icon-fixed-width" title="{% trans 'Google talk account' %}"></span> {{ user_.google_talk }}</li>
+              {% endif %}
+
+              {% if user_.github %}
+                <li><span class="icon-github icon-fixed-width" title="{% trans 'Github account' %}"></span> <a target="_blank" href="https://github.com/{{ user_.github }}">{{ user_.github }}</a></li>
+              {% endif %}
+
+              {% if user_.webpage %}
+                <li><span class="icon-link icon-fixed-width" title="{% trans 'Personal webpage' %}"></span> <a target="_blank" href="{{ user_.webpage }}" title="{% trans 'Personal webpage' %}">{{ user_.webpage }}</a></li>
+              {% endif %}
+            {% endif %}
+          {% endif %}
+        </ul>
+        {% if user_.mailinglists %}
+          <b>Listas de discussão</b>
+          {% for list in user_.mailinglists %}
+            <a href="{% url 'haystack_search' %}?order=latest&amp;type=thread&amp;list={{ list }}"><span class="label label-primary">{{ list }}</span></a>
+          {% endfor %}
+        {% endif %}
+
+        <div class="divider"></div>
+
+      </div>
+
+      <div class="col-lg-4 col-md-4 col-sm-7">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Collaborations by Type" %}</h3>
+          </div>
+          <div class="panel-body">
+            <div id="collabs"></div>
+            <div class="chart collabs">
+                <canvas width="200" height="200"></canvas>
+              <p></p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+
+      <div class="col-lg-4 col-md-4 col-sm-7">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">Participação por lista de discussão</h3>
+          </div>
+          <div class="panel-body">
+            <div class="chart collabs2">
+                <canvas width="200" height="200"></canvas>
+              <p></p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div> <!-- End of user-profile row -->
+
+    <div class="row">
+
+      <div class="col-lg-6 col-md-6 col-sm-12">
+        <h3>{% trans "Latest posted" %} </h3>
+        <ul class="message-list">
+        {% for doc in emails %}
+          {% include "message-preview.html" with result=doc %}
+        {% empty %}
+          <li>{% trans "There are no posts by this user so far." %}</li>
+        {% endfor %}
+        </ul>
+        <a href="{% url 'haystack_search' %}?type=thread&amp;author={{ user_.username }}">
+          {% trans "View more posts..." %}
+        </a>
+        <div>&nbsp;</div>
+      </div>
+
+      <div class="col-lg-6 col-md-6 col-sm-12">
+        <h3>{% trans "Latest contributions" %}</h3>
+        <ul class="message-list">
+        {% for result in results %}
+          {% include "message-preview.html" %}
+        {% empty %}
+          <li>{% trans "No contributions of this user so far." %}</li>
+        {% endfor %}
+        </ul>
+        <a href="{% url 'haystack_search' %}?order=latest&amp;collaborators={{ user_.username }}">
+          {% trans "View more contributions..." %}
+        </a>
+        <div>&nbsp;</div>
+      </div>
+
+    </div>
+  </div>
+{% endblock %}
@@ -135,9 +135,19 @@
     </div>
     <div id="sobre">
       <ul>
-        <li id="softwarepublico-groups" class="softwarepublico-item">
-          <a href="{% url 'thread_list' %}" title="Listas de discussão">Listas de discussão</a>
-        </li>
+        {% if not user.is_authenticated %}
+          <li id="softwarepublico-groups" class="softwarepublico-item">
+            <a href="{% url 'thread_list' %}" title="Listas de discussão">Listas de discussão</a>
+          </li>
+        {% else %}
+          <li class="dropdown softwarepublico-item">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Listas de discussão <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="{% url 'thread_list' %}">Acesse todas as listas</a></li>
+                <li><a href="{% url 'user_list_subscriptions' user %}">Inscreva-se nas listas</a></li>
+            </ul>
+          </li>
+        {% endif %}
         {% plugins_menu %}
         <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item">
           <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a>
 {% extends "base.html" %}
-{% load i18n highlight superarchives %}
+{% load i18n tz highlight superarchives search_preview_templates %}
 {% load static from staticfiles %}
 {% block title %}{% trans 'search'|title %}{% endblock %}
@@ -30,20 +30,20 @@
 {% endblock %}
 {% block main-content %}
-<div class="search-results" style="width: 980px;margin: auto;">
+<div class="colab-search-results" style="width: 980px;margin: auto;">
 <form accept-charset="UTF-8" action="/search/" method="get">
   <div class="container">
     <div class="row">
       <div class="col-md-12">
-        <div class="search-form">
-          <h3 class="search-title"> {% trans "BUSCAR NO PORTAL" %} </h3>
-          <div class="search-field">
+        <div class="colab-search-form">
+          <h3 class="colab-search-title"> {% trans "BUSCAR NO PORTAL" %} </h3>
+          <div class="colab-search-field">
             <span class="formfield">
-              <input class="search-input" id="search-input" name="q" value="" type="text">
+              <input class="colab-search-input" id="search-input" name="q" value="{{ request.GET.q }}" type="text">
             </span>
           </div>
-          <input class="btn search-blue with-text icon-search submit" name="commit" value="Buscar" type="submit">
+          <input class="btn colab-search-blue with-text icon-search submit" name="commit" value="Buscar" type="submit">
         </div>
       </div>
     </div>
@@ -63,9 +63,9 @@
         <select name="order" id="order_option" onchange="this.form.submit()">
           {% for option, dict_order in order_data.items %}
             {% ifequal request.GET.order option %}
-              <option value="{{option}}" selected>{% trans option %}</option>
+              <option value="{{option}}" selected>{% trans dict_order.name %}</option>
             {% else %}
-              <option value="{{option}}">{% trans option %}</option>
+              <option value="{{option}}">{% trans dict_order.name %}</option>
             {% endifequal %}
           {% endfor %}
         </select>
@@ -80,7 +80,8 @@
     <div class="col-md-12 col-lg-12">
       <div class="container">
       {% for result in page.object_list  %}
-        {% include "message-preview.html" %}
+        {% get_search_preview_templates result  as template_target %}
+        {% include template_target %}
       {% empty %}
       <ul class="list-unstyled">
         <li class="text-center">
@@ -144,4 +145,4 @@
   </div>
 </div>
-{% endblock main-content %}
 \ No newline at end of file
+{% endblock main-content %}
@@ -0,0 +1,101 @@
+{% extends 'base.html' %}
+{% load i18n %}
+
+{% block title %}Listas de discussão{% endblock %}
+
+{% block main-content %}
+  <div class="colab-content container">
+  <h2>Listas de discussão</h2>
+  <hr/>
+
+  {% for mailinglist in lists %}
+    {% if mailinglist.get_latest or mailinglist.get_most_relevant %}
+      <h3><b>{{ mailinglist.name|title|lower }} {% if mailinglist.description %} ({{ mailinglist.description }}){% endif %}</b></h3>
+      <div class="btn-group btn-group-sm">
+        <a href="#" class="btn btn-default" disabled="disabled">{% blocktrans with number_of_users=mailinglist.get_number_of_users %}{{ number_of_users }} members{% endblocktrans %}</a>
+      </div>
+      <hr/>
+
+      <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+          <h4>{% trans 'latest'|title %}</h4>
+          <ul class="message-list">
+            {% for thread in mailinglist.get_latest %}
+              {% include "message-preview.html" with result=thread.latest_message %}
+            {% endfor %}
+          </ul>
+          <div class="text-right">
+            <a href="{% url 'haystack_search' %}?order=latest&list={{ mailinglist.name }}&type=thread">
+              {% trans "more..." %}
+            </a>
+          </div>
+        </div>
+
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+          <h4>{% trans 'most relevant'|title %}</h4>
+          <ul class="message-list">
+            {% for thread in mailinglist.get_most_relevant %}
+              {% include "message-preview.html" with result=thread %}
+            {% endfor %}
+          </ul>
+          <div class="text-right">
+            <a href="{% url 'haystack_search' %}?list={{ mailinglist.name }}&type=thread">
+              {% trans "more..." %}
+            </a>
+          </div>
+        </div>
+      </div>
+
+
+    {% endif %}
+  {% endfor %}
+
+      {% if page_obj.has_other_pages %}
+        <div class="text-center">
+          <ul class="pagination">
+            <li {% if page_obj.number == 1 %}class="disabled"{% endif %}>
+              <a href="{% if page_obj.number == 1 %}javascript:void(0);{% else %}?page={{1}}{% endif %}"><span class="glyphicon glyphicon-chevron-left small-icon"></span><span class="glyphicon glyphicon-chevron-left small-icon"></span></a>
+            </li>
+            <li {% if not page_obj.has_previous %}class="disabled"{% endif %}>
+              <a href="{% if page_obj.has_previous %}?page={{page_obj.previous_page_number }}{% else %}javascript:void(0);{% endif %}"><span class="glyphicon glyphicon-chevron-left small-icon"></span></a>
+            </li>
+
+            {% if page_obj.has_previous %}
+              {% if page_obj.previous_page_number > 1 %}
+                <li>
+                  <a href="?page={{page_obj.previous_page_number|add:-2 }}">{{ page_obj.number|add:-2 }}</a>
+                </li>
+              {% endif %}
+              <li>
+                <a href="?page={{page_obj.previous_page_number }}">{{ page_obj.number|add:-1 }}</a>
+              </li>
+            {% endif %}
+
+            <li class="active">
+              <a href="javascript:void(0);">{{ page_obj.number }}</a>
+            </li>
+
+            {% if page_obj.has_next %}
+              <li>
+                <a href="?page={{page_obj.next_page_number }}">{{ page_obj.number|add:1 }}</a>
+              </li>
+              {% if page_obj.next_page_number < page_obj.paginator.num_pages %}
+                <li>
+                  <a href="?page={{page_obj.next_page_number|add:1 }}">{{ page_obj.number|add:2 }}</a>
+                </li>
+              {% endif %}
+            {% endif %}
+
+            <li {% if not page_obj.has_next %}class="disabled"{% endif %}>
+              <a href="{% if page_obj.has_next %}?page={{page_obj.next_page_number }}{% else %}javascript:void(0);{% endif %}"><span class="glyphicon glyphicon-chevron-right small-icon"></span></a>
+            </li>
+
+            <li {% if page_obj.number == page_obj.paginator.num_pages %}class="disabled"{% endif %}>
+              <a href="{% if page_obj.number == page_obj.paginator.num_pages %}javascript:void(0);{% else %}?page={{page_obj.paginator.num_pages }}{% endif %}"><span class="glyphicon glyphicon-chevron-right small-icon"></span><span class="glyphicon glyphicon-chevron-right small-icon"></span></a>
+            </li>
+
+          </ul>
+        </div>
+      {% endif %}
+    </div>
+{% endblock %}
 dist/
+*.tar.gz
 PACKAGE = noosfero-spb
-VERSION = $(shell cat VERSION)
+VERSION = 4.2.7
 DISTDIR = $(PACKAGE)-$(VERSION)
 TARBALL = $(DISTDIR).tar.gz
@@ -11,10 +11,9 @@ themes_dir=/usr/lib/noosfero/public/designs/themes
 noosfero_dir=/usr/lib/noosfero
 dist: clean
-	mkdir -p dist/$(DISTDIR)
-	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd dist/$(DISTDIR) && tar xaf -)
-	cd dist && tar --exclude=.git -czf $(TARBALL) $(DISTDIR)
-	$(RM) -r dist/$(DISTDIR)
+	mkdir $(DISTDIR)
+	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR) && tar xaf -)
+	tar --exclude=.git -czf $(TARBALL) $(DISTDIR)
 clean:
 	$(RM) -r dist/
@@ -1,7 +0,0 @@
-<ul id="cat_menu">
-  <% @environment.top_level_categories.find(:all, :conditions => {:display_in_menu => true}).each do |item| %>
-    <li id="category category_<%= item.path %>" >
-      <%= link_to(item.name, {:controller => :search, :action => 'category_index', :category_path => item.path }, :title => item.name, :style=>"color: ##{item.display_color || '000000'}" ) %>
-    </li>
-  <% end %>
-</ul><!-- fim id="cat_menu" -->
@@ -160,4 +160,3 @@
   text-align: center;
 }
-
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
-<circle id="circle_x5F_bg_17_" style="fill:#CF4832;" cx="16" cy="16" r="16.005"/>
-<g>
-	<polygon style="fill:#FFFFFF;" points="24.376,9.896 22.499,9.896 22.499,13.646 18.747,13.646 18.747,15.523 22.499,15.523 
-		22.499,19.273 24.376,19.273 24.376,15.523 28.126,15.523 28.126,13.646 24.376,13.646 	"/>
-</g>
-<g>
-	<path style="fill:#FFFFFF;" d="M14.933,25.068c-0.74-0.559-2.355-1.699-2.355-2.465c0-0.898,0.256-1.342,1.605-2.396
-		c1.387-1.082,2.367-2.51,2.367-4.279c0-1.93-0.789-3.678-2.27-4.527h2.102l1.787-1.879c0,0-5.91,0-8.008,0
-		c-4.061,0-7.447,2.996-7.447,6.291c0,3.367,2.225,6.051,6.045,6.051c0.264,0,0.523-0.01,0.775-0.027
-		C9.286,22.309,9.11,22.84,9.11,23.395c0,0.938,0.518,1.473,1.148,2.09c-0.48,0-0.941,0.01-1.449,0.01
-		c-1.805,0-3.395,0.486-4.67,1.254c0.396,0.436,0.814,0.85,1.254,1.238c1.1-0.949,2.709-1.561,4.471-1.541
-		c0.748,0.004,1.449,0.127,2.082,0.332c1.746,1.215,3.156,1.971,3.508,3.357c0.066,0.275,0.102,0.566,0.102,0.861
-		c0,0.34-0.033,0.666-0.098,0.982c0.174,0.006,0.342,0.025,0.518,0.025c0.639,0,1.264-0.047,1.883-0.119
-		c0.119-0.406,0.186-0.818,0.186-1.232C18.044,28.225,17.521,27.008,14.933,25.068z M10.306,20.645
-		c-2.156-0.066-4.209-2.049-4.58-4.881c-0.375-2.834,1.07-5.004,3.23-4.939c2.158,0.064,4.004,2.389,4.377,5.223
-		S12.464,20.707,10.306,20.645z"/>
-</g>
-</svg>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
-<circle style="fill:#EF8647;" cx="16" cy="16.001" r="16"/>
-<g>
-	<circle style="fill:#FFFFFF;" cx="10.617" cy="21.625" r="2.287"/>
-	<path style="fill:#FFFFFF;" d="M19.385,23.912h-3.242c0-4.316-3.496-7.812-7.812-7.812l0,0v-3.242
-		C14.436,12.858,19.385,17.807,19.385,23.912z"/>
-	<path style="fill:#FFFFFF;" d="M21.668,23.912c0-7.366-5.971-13.339-13.338-13.339V7.237c9.211,0,16.676,7.465,16.676,16.675
-		H21.668z"/>
-</g>
-</svg>
-<div class="comments-display-fields">
+<div class="comments-display-fields">                                                                                                  
   <span id="comments-additional-information">
     <%= _("Additional informations") %>
   </span>
 Summary: Collaboration platform for communities (Python dependencies)
 Name:    colab-deps
-Version: 1.11.6
+Version: 1.12.7
 Release: 1
 Source0: colab-deps-%{version}.tar.gz
 License: Various
@@ -7,7 +7,7 @@ License:        GPL-3.0
 Group:          Applications/Publishing
 Url:            https://softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-theme-plugin
 Source0:        %{name}-%{version}.tar.gz
-Requires:       colab >= 1.11
+Requires:       colab >= 1.12.5
 BuildArch:      noarch
 %description
 %define name colab
-%define version 1.11.4
+%define version 1.12.5
 %define buildvenv /var/tmp/%{name}-%{version}
 Summary: Collaboration platform for communities
 Name: %{name}
 Version: %{version}
-Release: 1
+Release: 4
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: Development/Tools
@@ -14,9 +14,8 @@ Prefix: %{_prefix}
 Vendor: Sergio Oliveira <sergio@tracy.com.br>
 Url: https://github.com/colab/colab
 BuildArch: noarch
-BuildRequires: colab-deps >= 1.11.6, python-virtualenv
-# FIXME colab should not depend on nginx!
-Requires: colab-deps >= 1.11.6, solr, mailman-api >= 0.3rc3, nginx
+BuildRequires: colab-deps >= 1.12.7, python-virtualenv
+Requires: colab-deps >= 1.12.7, solr, mailman-api >= 0.3rc3
 %description
 Integrated software development platform.
@@ -58,7 +57,7 @@ install -d -m 0755 %{buildroot}/var/log/colab
 install -d -m 0755 %{buildroot}/var/lib/colab/celery
 # Create assets dir (stores static files)
-install -d -m 0755 %{buildroot}/var/lib/colab/assets
+install -d -m 0755 %{buildroot}/var/lib/colab/assets/static
 # install virtualenv
 install -d -m 0755 %{buildroot}/usr/lib
@@ -94,20 +93,19 @@ rm -rf %{buildvenv}
 %files
 %defattr(-, root, root)
-/usr/lib/colab
-#/var/lib/colab # XXX: remove if doesnt break
-%attr(-, colab, colab) /var/lib/colab/assets
+%attr(-, colab, colab) /var/lib/colab/assets/static
 %attr(-, colab, colab) /var/lib/colab/celery
 %attr(-, colab, colab) /var/log/colab
 %{_bindir}/*
-/etc/cron.d/colab
-#/etc/colab # XXX: remove if doesnt break
-/etc/colab/settings.d
-/etc/colab/plugins.d
 /etc/colab/gunicorn.py.example
-/lib/systemd/system/colab.service
-/lib/systemd/system/celeryd.service
+/etc/colab/plugins.d
+/etc/colab/settings.d
+/etc/cron.d/colab
 /lib/systemd/system/celerybeat.service
+/lib/systemd/system/celeryd.service
+/lib/systemd/system/colab.service
+/usr/lib/colab
+/var/lib/colab/assets
 %pre
@@ -215,9 +213,6 @@ EOF
   chmod 0640 /etc/colab/settings.py
 fi
-# FIXME colab should not depend on nginx
-ln -s /var/lib/colab/assets /usr/share/nginx/colab
-
 colab-admin collectstatic --noinput
 if [ $1 -gt 1 ]; then
 Name:    noosfero-spb
-Version: 4.2.1
-Release: 12.1
+Version: 4.2.7
+Release: 1
 Summary: SPB-specific Noosfero plugins and themes
 Group:   Applications/Publishing
 License: AGPLv3
@@ -2,8 +2,8 @@
 %define cache_dirs javascripts/cache stylesheets/cache
 Name:    noosfero
-Version: 1.3.1+spb2
-Release: 6.1
+Version: 1.3.5
+Release: 1
 Summary: Social Networking Platform
 Group:   Applications/Publishing
 License: AGPLv3
1	admins:	1	admins:
2	- ["Paulo Meirelles", "paulo@softwarelivre.org"]	2	- ["Paulo Meirelles", "paulo@softwarelivre.org"]
3	external_hostname: spb.cdtc.unb.br	3	external_hostname: spb.cdtc.unb.br
		4	+sisp_external_hostname: sisp.cdtc.unb.br
4	external_ip: 164.41.9.49	5	external_ip: 164.41.9.49
5	site_url: https://spb.cdtc.unb.br	6	site_url: https://spb.cdtc.unb.br
6	colab_from_address: '"Portal do Software Publico" <noreply@spb.cdtc.unb.br>'	7	colab_from_address: '"Portal do Software Publico" <noreply@spb.cdtc.unb.br>'
	@@ -4,6 +4,7 @@ admins:		@@ -4,6 +4,7 @@ admins:
4	- ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]	4	- ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]
5	- ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]	5	- ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]
6	external_hostname: homologa.softwarepublico.gov.br	6	external_hostname: homologa.softwarepublico.gov.br
		7	+sisp_external_hostname: homologa.sisp.gov.br
7	external_ip: 189.9.151.65	8	external_ip: 189.9.151.65
8	alt_ssh_port: 55555	9	alt_ssh_port: 55555
9	site_url: https://homologa.softwarepublico.gov.br	10	site_url: https://homologa.softwarepublico.gov.br
	@@ -2,6 +2,7 @@ admins:		@@ -2,6 +2,7 @@ admins:
2	- ["Paulo Meirelles", "paulo@softwarelivre.org"]	2	- ["Paulo Meirelles", "paulo@softwarelivre.org"]
3	site_url: https://softwarepublico.lappis	3	site_url: https://softwarepublico.lappis
4	external_hostname: softwarepublico.lappis	4	external_hostname: softwarepublico.lappis
		5	+sisp_external_hostname: sisp.lappis
5	external_ip: 10.0.0.11	6	external_ip: 10.0.0.11
6	colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'	7	colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
7	server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'	8	server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
	@@ -5,6 +5,7 @@ admins:		@@ -5,6 +5,7 @@ admins:
5	- ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]	5	- ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]
6	site_url: https://softwarepublico.gov.br	6	site_url: https://softwarepublico.gov.br
7	external_hostname: softwarepublico.gov.br	7	external_hostname: softwarepublico.gov.br
		8	+sisp_external_hostname: novo.sisp.gov.br
8	alternative_hostnames:	9	alternative_hostnames:
9	- www.softwarepublico.gov.br	10	- www.softwarepublico.gov.br
10	- portal.softwarepublico.gov.br	11	- portal.softwarepublico.gov.br
	@@ -28,7 +28,8 @@ SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"		@@ -28,7 +28,8 @@ SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
28		28
29	SITE_URL = "<%= node['config']['site_url'] %>"	29	SITE_URL = "<%= node['config']['site_url'] %>"
30		30
31	-ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]	31	+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>",
		32	+ "<%= node['config']['sisp_external_hostname'] %>"]
32		33
33	## Disable indexing	34	## Disable indexing
34	ROBOTS_NOINDEX = False	35	ROBOTS_NOINDEX = False
1	production:	1	production:
2	- max_upload_size: 150MB	2	+ max_upload_size: 500MB
	@@ -6,11 +6,11 @@ upstream noosfero {		@@ -6,11 +6,11 @@ upstream noosfero {
6		6
7	server {	7	server {
8	listen *:80;	8	listen *:80;
9	- server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %>;	9	+ server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %> <%= node['config']['sisp_external_hostname'] %>;
10	underscores_in_headers on;	10	underscores_in_headers on;
11	access_log /var/log/nginx/noosfero.access.log;	11	access_log /var/log/nginx/noosfero.access.log;
12	error_log /var/log/nginx/noosfero.error.log;	12	error_log /var/log/nginx/noosfero.error.log;
13	- client_max_body_size 150m;	13	+ client_max_body_size 0;
14		14
15	root /usr/lib/noosfero/public;	15	root /usr/lib/noosfero/public;
16	location /social/ {	16	location /social/ {
	@@ -24,7 +24,7 @@ server {		@@ -24,7 +24,7 @@ server {
24	proxy_read_timeout 90;	24	proxy_read_timeout 90;
25	proxy_connect_timeout 90;	25	proxy_connect_timeout 90;
26	proxy_redirect off;	26	proxy_redirect off;
27	- proxy_set_header Host <%= node['config']['external_hostname'] %>;	27	+ proxy_set_header Host $host;
28	proxy_set_header X-Real-IP $remote_addr;	28	proxy_set_header X-Real-IP $remote_addr;
29	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;	29	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
30	}	30	}
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+-----BEGIN CERTIFICATE-----
	2	+MIIEgTCCA2mgAwIBAgIJAJz0XkZVg/KTMA0GCSqGSIb3DQEBCwUAMIHWMQswCQYD
	3	+VQQGEwJCUjEZMBcGA1UECAwQRGlzdHJpdG8gRmVkZXJhbDERMA8GA1UEBwwIQnJh
	4	+c2lsaWExPTA7BgNVBAoMNE1pbmlzdGVyaW8gZG8gUGxhbmVqYW1lbnRvLCBPcsOD
	5	+wqdhbWVudG8gZSBHZXN0w4PCo28xDTALBgNVBAsMBFNMVEkxIzAhBgNVBAMMGmRl
	6	+di5zb2Z0d2FyZXB1YmxpY28uZ292LmJyMSYwJAYJKoZIhvcNAQkBFhdwYXVsb0Bz
	7	+b2Z0d2FyZWxpdnJlLm9yZzAeFw0xNTAzMTIxOTQ3NTdaFw0xNzEyMDYxOTQ3NTda
	8	+MIHWMQswCQYDVQQGEwJCUjEZMBcGA1UECAwQRGlzdHJpdG8gRmVkZXJhbDERMA8G
	9	+A1UEBwwIQnJhc2lsaWExPTA7BgNVBAoMNE1pbmlzdGVyaW8gZG8gUGxhbmVqYW1l
	10	+bnRvLCBPcsODwqdhbWVudG8gZSBHZXN0w4PCo28xDTALBgNVBAsMBFNMVEkxIzAh
	11	+BgNVBAMMGmRldi5zb2Z0d2FyZXB1YmxpY28uZ292LmJyMSYwJAYJKoZIhvcNAQkB
	12	+FhdwYXVsb0Bzb2Z0d2FyZWxpdnJlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
	13	+ADCCAQoCggEBANUAsaDZ77GHyrlWDet+I2Xq8Sf31j3ponMXzMd/6zAu6NSDcZjl
	14	+LPrFEqfqBVdY3T1L5THDHG42ZS6n0FHsOTBq2JKswlcTSPyaHiweRI+lEMVzRcgm
	15	+GshtJnTWukMsDvOGwVe6zkcKWl5vG2KKgTrI0l+QnCbCP10UNqwTCl2gN5l0piDl
	16	+rTiBwRbfn1wdGd9JgQr+MQrMhPnE31vsSA8G5p0KUX4oxYgmKmMykutqJIia7LeF
	17	+VQtMuRZbfz/HwtUtFuAa3ztBQiKmoZlrh1k/akm3YhBiramtAXEt7aHI6HY3X0pw
	18	+l7AE7MHOutCfoshEHZToZNJiyXpDATIIwfsCAwEAAaNQME4wHQYDVR0OBBYEFDVm
	19	+z5gED6aHPs1H9DdqUfGIY0vfMB8GA1UdIwQYMBaAFDVmz5gED6aHPs1H9DdqUfGI
	20	+Y0vfMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBANNc+ZD4ImQI8V2Y
	21	+2lkRnRQvQ7M2mdAgRaP5f4EJLLlczmRPzNhItiYr9njg8pUdN50iQPnvwlDJhI5d
	22	+mFuDypY1AhLB74sSDk7Um3gFP5rAlKdD9WrmKA3FSfGcUJA2Usa+6NnudBmm1Uvn
	23	+yLGpOCSnxQfTZ+81XanI9Sy6kV/6Nwpaid9akmm3aIUtJA0thC0OWEhHMY97vqBF
	24	+7or8IKooXxIx4jNbholJXQ2zD5tc5nDfBwB9DFBX7LeXRqZQE4T0eUOhF/shoRnG
	25	+gFSMN8Vjhw8eV7wPvxX6aX8kZmfZgAF1m4EzEaDLs2iL7dVkPxO7SSlXqkg0nLuH
	26	+RWIj+F0=
	27	+-----END CERTIFICATE-----
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+-----BEGIN PRIVATE KEY-----
	2	+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVALGg2e+xh8q5
	3	+Vg3rfiNl6vEn99Y96aJzF8zHf+swLujUg3GY5Sz6xRKn6gVXWN09S+UxwxxuNmUu
	4	+p9BR7DkwatiSrMJXE0j8mh4sHkSPpRDFc0XIJhrIbSZ01rpDLA7zhsFXus5HClpe
	5	+bxtiioE6yNJfkJwmwj9dFDasEwpdoDeZdKYg5a04gcEW359cHRnfSYEK/jEKzIT5
	6	+xN9b7EgPBuadClF+KMWIJipjMpLraiSImuy3hVULTLkWW38/x8LVLRbgGt87QUIi
	7	+pqGZa4dZP2pJt2IQYq2prQFxLe2hyOh2N19KcJewBOzBzrrQn6LIRB2U6GTSYsl6
	8	+QwEyCMH7AgMBAAECggEAa2w6KUFAXWx6lRYNVyL6f0AJ93pKllbqEtmB8WtWFarS
	9	+ybqw48dQ8/fH/N9Nakvq6CsKoBoikILmbK09ptNX1E9OgkqWiIu1V4/yf5WURk2d
	10	+M7d7DgIJp+NEbdCNh6sEr1Ta1X/k4HccNFwcl4n6usblMkUgO3vjsPGs0QOZSrXD
	11	+NDp4ixdElxyuZPZnRkrry4JZzm0Jad/kNw0naz0S+YLqysJNOD1kepN+DAlap5WE
	12	+oEfvmkLgrTDnjar8cK3i/EzbzNxWxLo89IdbbnpPV3m/SSQO7p689uL+VkZxLz0I
	13	+uzVg6TZ1jQ5+IWjKL0Aqt5xkStaZp2uh8vlNw/0IQQKBgQDwBVtI+2ASacuu6eJL
	14	+RTWalTPH/jr9mA0Ism2Px5hdI7vugJ3NJY0fIRTzRU53MFfRXZIcpYf+60stYhiX
	15	+QBmF/DukxtUL4naOz2VzkY5RcKnfsvUff65KGaCdHzWQQsL93qEjpusRMQwhGErt
	16	+vgKsbjgyHaVbVLGNZuFYoNLzkwKBgQDjLt6d8p7rR2e89sQKuE0B43UiuL/rDY1n
	17	+OC411KwqsKFX3J/ias4NIy/h1BEag+Ron9SMRAlVoPg+2aLmywZp4KijcFxSLUFI
	18	+2fWtoRXEyAOgz61I9SonGvBQLCLAZ+24VpoymmMNdH/xbeoysRCxovPw3NPnFfzB
	19	+xYfiRpXI+QKBgE9v1mhvGbq+XPUE3yo+O6Fvo/WaxHdNrXKlavFdA6Y/v2EOHCvb
	20	+M7uLvV1OIMv9qfLW3xawCjRqNzVL9AuK4WegtTSxwazvRIG7Tj5TfCCkAvTQS6Qj
	21	+I9HObYPS4m1eSx6uYfJkugO0kekaGyJX8paS2/JqMWHqw+Cing4xG+AVAoGBAKx2
	22	+DStMXpXve/H4RnR42oS/flGgfJjcjea4wGO/Ef/KXIENjBZezBMvDg9aZK2DSGag
	23	+RsNAdvGZJDraDo8zuqevk3WXO45qqm+6foWTjqn2yMJQRZToAFr1WU8TYkI74zuY
	24	+CrC1gNJbCTFnJm3a+vhO4u6LRRXdHCahZHlC6jxJAoGARpcsSUSXqWOsmCvP+d0I
	25	+m3B7DTJc0fL7WOoXINSa1U4zr9vMfSxTdWBdlKmizDvzzz9+Rx+03TGQkqzroTk/
	26	+eWZuPuJ74qXkT68JCoCmf6MBolIkWqkDO5zKlQF3hkb3c16mOKCqzQpXLGtoZQRG
	27	+PH+5xM1maQvJxF5tCVQz0uU=
	28	+-----END PRIVATE KEY-----
	@@ -6,6 +6,13 @@ cookbook_file "/etc/nginx/#{node['config']['external_hostname']}.crt" do		@@ -6,6 +6,13 @@ cookbook_file "/etc/nginx/#{node['config']['external_hostname']}.crt" do
6	notifies :restart, 'service[nginx]'	6	notifies :restart, 'service[nginx]'
7	end	7	end
8		8
		9	+cookbook_file "/etc/nginx/#{node['config']['sisp_external_hostname']}.crt" do
		10	+ owner 'root'
		11	+ group 'root'
		12	+ mode 0600
		13	+ notifies :restart, 'service[nginx]'
		14	+end
		15	+
9	cookbook_file "/etc/sysctl.d/ip_forward.conf" do	16	cookbook_file "/etc/sysctl.d/ip_forward.conf" do
10	owner 'root'	17	owner 'root'
11	group 'root'	18	group 'root'
	@@ -23,6 +30,13 @@ cookbook_file "/etc/nginx/#{node['config']['external_hostname']}.key" do		@@ -23,6 +30,13 @@ cookbook_file "/etc/nginx/#{node['config']['external_hostname']}.key" do
23	notifies :restart, 'service[nginx]'	30	notifies :restart, 'service[nginx]'
24	end	31	end
25		32
		33	+cookbook_file "/etc/nginx/#{node['config']['sisp_external_hostname']}.key" do
		34	+ owner 'root'
		35	+ group 'root'
		36	+ mode 0600
		37	+ notifies :restart, 'service[nginx]'
		38	+end
		39	+
26	template '/etc/nginx/conf.d/reverse_proxy.conf' do	40	template '/etc/nginx/conf.d/reverse_proxy.conf' do
27	owner 'root'	41	owner 'root'
28	group 'root'	42	group 'root'