From 395e5968227108a9510a251e3fb8b786387c9f13 Mon Sep 17 00:00:00 2001
From: Varac <varac@leap.se>
Date: Wed, 14 Jun 2017 14:21:57 +0200
Subject: Remove pixelated from unstable

---
 .../pixelated/templates/05-pixelated.conf.erb      |  7 ---
 .../pixelated/templates/pixelated-apache.conf.erb  | 60 ----------------------
 .../pixelated/templates/pixelated-server-default   |  9 ----
 .../pixelated/templates/webapp/show.html.haml.erb  |  6 ---
 4 files changed, 82 deletions(-)
 delete mode 100644 files/puppet/modules/pixelated/templates/05-pixelated.conf.erb
 delete mode 100644 files/puppet/modules/pixelated/templates/pixelated-apache.conf.erb
 delete mode 100644 files/puppet/modules/pixelated/templates/pixelated-server-default
 delete mode 100644 files/puppet/modules/pixelated/templates/webapp/show.html.haml.erb

(limited to 'files/puppet/modules/pixelated/templates')

diff --git a/files/puppet/modules/pixelated/templates/05-pixelated.conf.erb b/files/puppet/modules/pixelated/templates/05-pixelated.conf.erb
deleted file mode 100644
index edcf299..0000000
--- a/files/puppet/modules/pixelated/templates/05-pixelated.conf.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is managed by Puppet, changes may be overwritten
-if $syslogtag contains_i 'user-agent' then {
-action(type="omfile" file="/var/log/pixelated/user-agent.log" template="RSYSLOG_TraditionalFileFormat")
-  stop
-}
-
-
diff --git a/files/puppet/modules/pixelated/templates/pixelated-apache.conf.erb b/files/puppet/modules/pixelated/templates/pixelated-apache.conf.erb
deleted file mode 100644
index 9f71420..0000000
--- a/files/puppet/modules/pixelated/templates/pixelated-apache.conf.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<VirtualHost *:80>
-  ServerName mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>
-  RewriteEngine On
-  RewriteRule ^.*$ https://mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>%{REQUEST_URI} [R=permanent,L]
-  CustomLog ${APACHE_LOG_DIR}/mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>.log common
-</VirtualHost>
-
-<VirtualHost *:443>
-  ServerName mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>
-  CustomLog ${APACHE_LOG_DIR}/mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>.log common
-
-  SSLCACertificatePath /etc/ssl/certs
-  SSLCertificateChainFile /usr/local/share/ca-certificates/leap_commercial_ca.crt
-  SSLCertificateKeyFile /etc/x509/keys/leap_commercial.key
-  SSLCertificateFile /etc/x509/certs/leap_commercial.crt
-
-  Include include.d/ssl_common.inc
-
-  <IfModule mod_headers.c>
-    Header always unset X-Powered-By
-    Header always unset X-Runtime
-    Header set X-Frame-Options SAMEORIGIN
-  </IfModule>
-
-  DocumentRoot /srv/leap/webapp/public
-
-  SSLProxyEngine on
-  ProxyPass / https://<%= scope.lookupvar('::pixelated::agent::domain')  %>:8080/
-  ProxyPassReverse / https://<%= scope.lookupvar('::pixelated::agent::domain')  %>:8080/
-</VirtualHost>
-
-
-Listen 8083
-<VirtualHost *:8083>
-  ServerName mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>
-  CustomLog ${APACHE_LOG_DIR}/mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>.log common
-
-  SSLCACertificatePath /etc/ssl/certs
-  SSLCertificateChainFile /usr/local/share/ca-certificates/leap_commercial_ca.crt
-  SSLCertificateKeyFile /etc/x509/keys/leap_commercial.key
-  SSLCertificateFile /etc/x509/certs/leap_commercial.crt
-
-  Include include.d/ssl_common.inc
-
-  <IfModule mod_headers.c>
-    Header always unset X-Powered-By
-    Header always unset X-Runtime
-  </IfModule>
-
-  DocumentRoot /srv/leap/webapp/public
-
-  SSLProxyEngine on
-  ProxyPass / https://<%= scope.lookupvar('::pixelated::agent::domain')  %>:8080/
-  ProxyPassReverse / https://<%= scope.lookupvar('::pixelated::agent::domain')  %>:8080/
-  Header unset Content-Security-Policy
-  Header unset X-Content-Security-Policy
-  Header unset X-Webkit-Csp
-
-</VirtualHost>
-
diff --git a/files/puppet/modules/pixelated/templates/pixelated-server-default b/files/puppet/modules/pixelated/templates/pixelated-server-default
deleted file mode 100644
index efe91dd..0000000
--- a/files/puppet/modules/pixelated/templates/pixelated-server-default
+++ /dev/null
@@ -1,9 +0,0 @@
-# managed by puppet
-
-FEEDBACK_URL=
-HOME=/var/lib/pixelated
-LEAP_PROVIDER=<%= @domain %>
-SSL_KEY=/etc/x509/keys/leap_commercial.key
-SSL_CERT=/etc/x509/certs/leap_commercial.crt
-LEAP_CA=/etc/ssl/certs/ca-certificates.crt
-EXTRA_OPTS="--banner /etc/pixelated/pixelated_banner.html"
diff --git a/files/puppet/modules/pixelated/templates/webapp/show.html.haml.erb b/files/puppet/modules/pixelated/templates/webapp/show.html.haml.erb
deleted file mode 100644
index 0ede372..0000000
--- a/files/puppet/modules/pixelated/templates/webapp/show.html.haml.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-= render 'overview'
-.container-fluid
-  .row-fluid
-    %br
-    %h4
-      = link_to 'Go to your Pixelated inbox', 'https://mail.<%= scope.lookupvar('::pixelated::agent::domain')  %>'
-- 
cgit v1.2.3