From af5dd9ad8ba46fea8c34831f577f210425ccb6bb Mon Sep 17 00:00:00 2001
From: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
Date: Mon, 6 Feb 2023 22:11:57 +0100
Subject: [PATCH] [install,g5k] Remove deprecated stuff

---
 g5k/puppetplay/puppetplay         | 24 ------------------------
 g5k/restfully/api.grid5000.fr.yml |  5 -----
 install.sh                        | 16 ----------------
 3 files changed, 45 deletions(-)
 delete mode 100644 g5k/puppetplay/puppetplay
 delete mode 100755 g5k/restfully/api.grid5000.fr.yml

diff --git a/g5k/puppetplay/puppetplay b/g5k/puppetplay/puppetplay
deleted file mode 100644
index de973a0..0000000
--- a/g5k/puppetplay/puppetplay
+++ /dev/null
@@ -1,24 +0,0 @@
-# Puppetplay configuration file
-
-## Puppetplay ##
-#
-# ssh_gateway :
-# - use false for a usage from the puppet master
-# - use true for an external usage (a tunnel to the puppetmasters will be created)
-ssh_gateway         true
-ssh_config_files    '~/.ssh/config_g5k'
-
-# master : define how to get platform configuration (sites, etc...) in order to generate the ~/.puppetplay_cache file
-master              "name" => "Master", "puppet_server" => "puppet.grid5000.fr", "rails_port" => '9000', "rails_base_uri" => '/puppet_master'
-
-# default_site : site you manage by default (override with --site option)
-default_site        'luxembourg'
-
-
-## Capistrano ##
-#
-capistrano_user     'g5kadmin'
-
-# capistrano_gateway is used for parallel command even if another tunnel is created via the ssh_config_files
-# Use a Grid'5000 fqdn if you use a ssh tunnel via ssh_config_files
-capistrano_gateway  'g5k'
diff --git a/g5k/restfully/api.grid5000.fr.yml b/g5k/restfully/api.grid5000.fr.yml
deleted file mode 100755
index 46489db..0000000
--- a/g5k/restfully/api.grid5000.fr.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-base_uri: https://api.grid5000.fr/sid
-username: hcartiaux
-password:
-gateway: access.grid5000.fr
-
diff --git a/install.sh b/install.sh
index 585df28..ebc440c 100755
--- a/install.sh
+++ b/install.sh
@@ -113,17 +113,6 @@ ln -sf $DOTFILES/gnupg/gpg-agent.conf  ~/.gnupg/gpg-agent.conf
 
     ln -sf $DOTFILES/rvm/rvmrc  ~/.rvmrc
 
-    ## G5K
-
-    echo "ssh_config_files: '~/.ssh/config_g5k'" > ~/.net-admin.yaml
-    touch ~/.password-store
-
-    if [[ ! -d ~/.restfully ]]; then
-        mkdir ~/.restfully
-        cp $DOTFILES/g5k/restfully/api.grid5000.fr.yml ~/.restfully
-        ln -sf ~/.restfully/api.grid5000.fr.yml ~/.restfully/api.grid5000.fr.yaml
-    fi
-
     ## temporary files
 
     ln -sf /tmp ~/.adobe
@@ -133,8 +122,3 @@ ln -sf $DOTFILES/gnupg/gpg-agent.conf  ~/.gnupg/gpg-agent.conf
 
 )
 
-[[ "$WORK" != "" ]] && (
-    mkdir -p $WORK/.local
-    ln -sf $WORK/.local ~/.local
-)
-