summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-19 12:15:28 +0200
committerAzul <azul@leap.se>2012-10-19 12:15:28 +0200
commit60619169a56de26825cb55a9a845288eed50de2f (patch)
tree3a2b294522a018d4a532a3324e643288fc069bda
parent93974e99296641822c734a3c192cc6c550efc696 (diff)
Revert "Created deploy branch with some springbok specifics"
This reverts commit 439e27ef2792a03e5e50f8b9c607fca512cb1452. Conflicts: config/cert
-rw-r--r--config/cert56
-rw-r--r--config/deploy.rb37
-rw-r--r--public/config/eip-service.json14
3 files changed, 0 insertions, 107 deletions
diff --git a/config/cert b/config/cert
deleted file mode 100644
index 27db0fd..0000000
--- a/config/cert
+++ /dev/null
@@ -1,56 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIFfQIBAAKCATEArnxTeU82frha6g4AchpzAA92ry0PD/FZVK5UiMsbwHfAl/XJ
-udVH0+51DSC5X4p9esftRQNCaJY/4zESe15Sna7aR+FyUoE+LcPpzMpCYH61TUzj
-YLQLzfay6cw1arn QC87f3tvmWI7F0zb9KWE9c
-XepnHyr2QJDzMiL This is an invalid eOUK8hc+uTReTXpAtD3S3X
-rC3KeJR+jOynTkJ key block for testing Sc6Cz2uJBeARNLvTBAj66q
-zfvMIlBOBRCWSQf please replace with a IfExunVQnU+xbRx7W9Gg3i
-NV307K4fgLJbY4b valid client key Y69SOuXgz7ECsoXy1bWQsi
-TETM5TX/6dADz0z FCc8I167mT25s2HNLnZ8AI
-8zqMwDMRf9x7a4GBGmm7n+YSCLy3f8fejw2ZAQIDAQABAoIBMAt3bSQ8Nz3AT20x
-XfEusdn/mGSpq7Co3CprStlr+IaVixpe622FPCNOt0x1RMjR2yrzYkvzC9DZperp
-mWLj7XF3X8FS3gd0Whhl4bS5yZuC8cd7Gq4bx8mGPIwqQzwOXb1mJXt5RPv+zU6X
-J4cSX0GIUBNb1yVsUDouqo1q+saPgBSjhS4xr6sb38XALvzvgVvY/M7YGpSr0Vyv
-ErAwxaGpdk+RppAjcxWBXLuMcIgtU+gSoEogdYzJkoJdwOfcyIllyqlaamcv4T84
-gMWRFncCgZkAzUBt1t3GpuyGVPkD2evtQrBWwg09kx1PAyoNwLDOiarmzUr/euvC
-4W+BfbvmH3Q1dfyQMc/+Y2/LAhvwwkp1F66KsF1xcz6q3FCDN0BGurhIH3rsS1r8
-m+FZ324xLCYXYBDXCwa3B1YsX9d54JuzXzClr+t0xoz5lZzDLgwEEdK9bttGBL0w
-ReIl7KW/TwKDbkPxe+3yCI8CgZkA2aCJUmCtkvaCIX0Udr6g3iyu6lQYbq532/FW
-MNh+KJA3NqXOvGZd9T1DfjlxOqsfGD4H92ekUdy/GdX9SAH4A0RW24gUazNY9N1d
-tdkq8OAxwswquvXC0U5WXsZVp6z1CFawjUiZbW8CgZkAvP9V5SOkN7LWY0pFJJad
-i+oKiXdduqijR/uiXEuyc4v+KQ2lQM/1DEqu0hGKj+enYJtBGPMe+E9+XuZwYMWe
-nsmR1/LNPcM0U3LdOvpviOXv7zNUPyri5sMhjuDFnzMHw1REhsnKqk+XtKJ7yLx9
-I8hiBtKUlBUhietNWEQEnQzxxKMRELaAU+1RFJ7vEVb0JUXFCGPrmbsCgZkAyZrW
-4Zr+GyGz96AetksM5svDVqVed9qzxqPX7/i16F3HmIJKS8lVXLj3TDBJAQTJNhSN
-m+HD6mlClBNzaa2fCTMLtzjAiYhGsRIZbpagCKPRAmcH5bBPSmi+pahBJMBxxdtx
-NdhleRCuWBjM0nBAeYZNkIG3qLegqPaJif4zeJ74QWWsDePox8Xr59C6ev23nUUb
-MnMW7zECgZkAwOOGuqJHyUlsVuErs5c/rLyY0NAqrGoiBp3o5fGnuINzrZSO3zvY
-PcuBeQmnZbkNarfQxFz1ezcf6jmszNStktDj3tFSR8srqpcRKyUPDi1eHD81n8vv
-h1jew1zPRQaQvVZ88p0xacYJeRckbKxcIPGweVqpT9ZJAEGg4J6FFcH+fOIra/7R
-TgLJs443xbTO2GM/25Anc/Pj4bnL2GWqDTurTxANAtmKenuWHTcz47Pm5WNhZP/l
-WWxi9MBzz/80IediLG6qrlU=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIEAzCCAlWgAwIBAgIEUFDq+zANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDEwRU
-RVNUMB4XDTEyMDkxMjIwMDUxNVoXDTEzMDkxMjIwMDUxNVowOjEPMA0GA1UEChMG
-YLQLzfay6cw1arn QC87f3tvmWI7F0zb9KWE9c
-XepnHyr2QJDzMiL This is an invalid eOUK8hc+uTReTXpAtD3S3X
-rC3KeJR+jOynTkJ cert block for testing Sc6Cz2uJBeARNLvTBAj66q
-zfvMIlBOBRCWSQf please replace with a IfExunVQnU+xbRx7W9Gg3i
-NV307K4fgLJbY4b valid server cert Y69SOuXgz7ECsoXy1bWQsi
-TETM5TX/6dADz0z FCc8I167mT25s2HNLnZ8AI
-4GFRwh8TG6dVCdT7FtHHtb0aDeLzOozAMxF/3HtrgYEaabuf5hIIvLd/x96PDZkB
-WAotdJzoLPa4kF4BE0u9MECPrqrN+8wiUE4FEJZJB+/M2WFm+pfZgp1qXx6AL0IC
-AgMBAAGjdjB0MAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDwYD
-VR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUU9Uc5ljBzINN4S6oj80rn+mJTLEwHwYD
-AMCxt8hxLtQlSgfY4MHxlNOE/hepArRQ1KoqW8TZ3DaDZacYuHK6TkarBuVshrAa
-VR0jBBgwFoAU/z1/F2dGNow5Kac+jx7NtyIM0BAwDQYJKoZIhvcNAQELBQADggGX
-TkPLvTbMIeZ/DGC6snrnyspVPVun8X1NcdkqOiSWCt5Y1Li4sClXT+XUFaKES4NS
-SN8LDKX0J+q2n4nRuotaOdq12qs8ZQkMsSI5ueR0soHY1XuSJCK75PFxLJKq3ydm
-FhMVy/bQZgl9QAt7HNK7QoISBmkQFYey0Qq7aotloMhlIyCSN569RcKHdPhZCsCE
-c/YgEkmZwOBR7ypXnT0Tcele120v+qhCRSeoZIEwtm27Dp8+My82fpx7xMKYAHn8
-VhdODq6KZ9Tk8MnYenC7SfiJ/cR0N/Yw5R8Yaa1K5qO+dyIwfXTkTr/Kg97N72jE
-M6lQJXeXaD8sR9wE2nhxKnTJToebjr9mnlgavSsotnzjnm9fMt5CPGOUtG/qGNfB
-GB/GF1HkbZW7VnGWjgNAozftTRCsFoCTwv/ICcW+vYEDVh+hzWjJ/KLl7PruKDPS
-rBlWWdV02QtVKpKYKvynML9kyEX6HeM=
------END CERTIFICATE-----
diff --git a/config/deploy.rb b/config/deploy.rb
deleted file mode 100644
index 9dc058a..0000000
--- a/config/deploy.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require "bundler/capistrano"
-
-set :application, "webapp"
-
-set :scm, :git
-set :repository, "git://leap.se/leap_web"
-set :branch, "deploy"
-
-set :deploy_via, :remote_cache
-set :deploy_to, '/home/webapp'
-set :use_sudo, false
-
-set :normalize_asset_timestamps, false
-
-set :user, "webapp"
-
-set :git_enable_submodules, 1 # we're using an srp js submodule for now
-
-role :web, "94.103.43.3" # Your HTTP server, Apache/etc
-role :app, "94.103.43.3" # This may be the same as your `Web` server
-# role :db, "your primary db-server here", :primary => true # This is where Rails migrations will run
-# role :db, "your slave db-server here"
-
-# if you want to clean up old releases on each deploy uncomment this:
-# after "deploy:restart", "deploy:cleanup"
-
-# if you're still using the script/reaper helper you will need
-# these http://github.com/rails/irs_process_scripts
-
-# If you are using Passenger mod_rails uncomment this:
-# namespace :deploy do
-# task :start do ; end
-# task :stop do ; end
-# task :restart, :roles => :app, :except => { :no_release => true } do
-# run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
-# end
-# end
diff --git a/public/config/eip-service.json b/public/config/eip-service.json
deleted file mode 100644
index 29959d7..0000000
--- a/public/config/eip-service.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "serial": 1,
- "version": "0.1.0",
- "capabilities": {
- "transport": ["openvpn"],
- "ports": ["80","53", "443", "1194"],
- "protocols": ["udp"],
- "static_ips": false,
- "adblock": false
- },
- "gateways": [
- {"country_code": "tr", "name": "turkey", "label": {"en":"Ankara, Turkey"}, "capabilities": {}, "hosts": ["94.103.43.4"]}
- ]
-}