diff --git a/configs/hic-ubuntu-22.04-desktop-example.yml b/configs/hic-ubuntu-22.04-desktop-example.yml index 694c280..0045a5f 100644 --- a/configs/hic-ubuntu-22.04-desktop-example.yml +++ b/configs/hic-ubuntu-22.04-desktop-example.yml @@ -22,6 +22,7 @@ modules: - ssms - utils - vscode + - shared-services-config files: - src: conda-envs/example.yml diff --git a/configs/hic-windows-2019-example.yml b/configs/hic-windows-2019-example.yml index 7d5df86..ffdd583 100644 --- a/configs/hic-windows-2019-example.yml +++ b/configs/hic-windows-2019-example.yml @@ -27,6 +27,7 @@ modules: - ssms - vscode - autohibernate + - shared-services-config files: - src: conda-envs/example.yml diff --git a/modules/rstudio.ps1 b/modules/rstudio.ps1 index 48bf906..4c18474 100644 --- a/modules/rstudio.ps1 +++ b/modules/rstudio.ps1 @@ -15,13 +15,6 @@ Start-Process C:\Tools\RTools.exe -ArgumentList "/VERYSILENT" -NoNewWindow -Wait $RConfig = @" # Set the default help type options(help_type="html") - -# HIC TRE R Repository -local({r <- getOption("repos") - r["CRAN"] <- "http://cran.hic-tre.dundee.ac.uk/" - options(repos=r) -}) - # Set timezone Sys.setenv(TZ='Europe/London') "@ diff --git a/modules/rstudio.sh b/modules/rstudio.sh index c52a1d5..966d0df 100644 --- a/modules/rstudio.sh +++ b/modules/rstudio.sh @@ -40,13 +40,6 @@ fi cat > "$HOME/.Rprofile" < "$HOME/.condarc" +channels: + - conda-forge +channel_alias: "http://conda.${SHARED_SERVICES_DOMAIN}/" +EOF + +cat <> "$HOME/.Rprofile" +# TRE CRAN repository +local({r <- getOption("repos") + r["CRAN"] <- "http://cran.${SHARED_SERVICES_DOMAIN}/" + options(repos=r) +}) +EOF + +# The following sets the global DNS server which is used for entries in +# the Domains key when prefixed with a tilde. The Link name server (set +# by DHCP) is used for all other queries, allowing SSM endpoints etc to +# still be resolved within the VPC. +echo "DNS=${SHARED_SERVICES_DNS}" | sudo tee -a /etc/systemd/resolved.conf +echo "Domains=~${SHARED_SERVICES_DOMAIN}" | sudo tee -a /etc/systemd/resolved.conf +sudo systemctl restart systemd-resolved