diff options
author | Leif Johansson <leifj@sunet.se> | 2015-09-23 23:20:50 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-09-23 23:20:50 +0200 |
commit | 4ab73f34b7d7a562b9b4d1ef15234c3d85b01a34 (patch) | |
tree | 9ef48bc9a18aaa2df597f647d9ba4535d347de7f | |
parent | a7f14bed2d9ec18156c6806a18af9d6849a4ccda (diff) |
ssh config for mds:ensunet-ops-2015-09-23-v28
-rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 | ||||
-rw-r--r-- | mds1.swamid.se/overlay/root/.ssh/config | 4 | ||||
-rw-r--r-- | mds2.swamid.se/overlay/root/.ssh/config | 4 | ||||
-rw-r--r-- | mdx1.swamid.se/overlay/etc/gitweb.conf | 30 | ||||
l--------- | mdx1.swamid.se/overlay/opt/pyff/mdx.fd | 1 |
5 files changed, 12 insertions, 31 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 216b70d..9f152a7 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -155,6 +155,10 @@ node 'sto-fre-kvm1.swamid.se' { } +node 'git.swamid.se' { + +} + node 'datasets.sunet.se' { class {'sunet::dockerhost': } -> file {'/opt/lobo2-redis-data': diff --git a/mds1.swamid.se/overlay/root/.ssh/config b/mds1.swamid.se/overlay/root/.ssh/config new file mode 100644 index 0000000..0495928 --- /dev/null +++ b/mds1.swamid.se/overlay/root/.ssh/config @@ -0,0 +1,4 @@ +Host md-master.swamid.se + IdentityFile ~/.ssh/md +Host git.swamid.se + IdentityFile ~/.ssh/md diff --git a/mds2.swamid.se/overlay/root/.ssh/config b/mds2.swamid.se/overlay/root/.ssh/config new file mode 100644 index 0000000..181a1a8 --- /dev/null +++ b/mds2.swamid.se/overlay/root/.ssh/config @@ -0,0 +1,4 @@ +Host md-master.swamid.se + IdentityFile ~/.ssh/md +Host git.swamid.se + IdentityFile ~/.ssh/md diff --git a/mdx1.swamid.se/overlay/etc/gitweb.conf b/mdx1.swamid.se/overlay/etc/gitweb.conf deleted file mode 100644 index db6028a..0000000 --- a/mdx1.swamid.se/overlay/etc/gitweb.conf +++ /dev/null @@ -1,30 +0,0 @@ -# path to git projects (<project>.git) -$projectroot = "/home/git/repositories"; - -# directory to use for temp files -$git_temp = "/tmp"; - -# target of the home link on top of all pages -#$home_link = $my_uri || "/"; - -# html text to include at home page -#$home_text = "indextext.html"; - -# file with project list; by default, simply scan the projectroot dir. -$projects_list = "/home/git/projects.list"; - -# stylesheet to use -#@stylesheets = ("static/gitweb.css"); - -# javascript code for gitweb -#$javascript = "static/gitweb.js"; - -# logo to use -#$logo = "static/git-logo.png"; - -# the 'favicon' -#$favicon = "static/git-favicon.png"; - -# git-diff-tree(1) options to use for generated patches -#@diff_opts = ("-M"); -@diff_opts = (); diff --git a/mdx1.swamid.se/overlay/opt/pyff/mdx.fd b/mdx1.swamid.se/overlay/opt/pyff/mdx.fd deleted file mode 120000 index 58d705b..0000000 --- a/mdx1.swamid.se/overlay/opt/pyff/mdx.fd +++ /dev/null @@ -1 +0,0 @@ -/opt/swamid-metadata/mdx.fd
\ No newline at end of file |