Merge pull request #171 from nielsaka/master

Fix default password for rocker/rstudio

Author: sckott

DESCRIPTION

@@ -33,4 +33,4 @@ Suggests:
     testthat,
     knitr,
     xml2
-RoxygenNote: 6.1.1
+RoxygenNote: 6.1.0

R/debian.R

@@ -44,7 +44,7 @@ debian_install_r <- function(droplet) {
 #' @param password Default password for Rstudio.
 #' @param version Version of rstudio to install.
 #' @export
-debian_install_rstudio <- function(droplet, user = "rstudio", password = "rstudio",
+debian_install_rstudio <- function(droplet, user = "rstudio", password = "server",
                                    version = "0.99.484") {
   droplet %>%
     debian_apt_get_install("gdebi-core", "libapparmor1") %>%

R/docklet.R

@@ -29,8 +29,8 @@
 #' @param args (character) Docker args
 #' @param docker_args (character) Docker args
 #' @param user (character) User name. Default: \code{"rstudio"}
-#' @param password (character) Password. Default: \code{"rstudio"}
-#' @param email (character) Password. Default: \code{"rstudio@@example.com"}
+#' @param password (character) Password. Default: \code{"server"}
+#' @param email (character) E-mail address. Default: \code{"rstudio@@example.com"}
 #' @param img (character) Docker image (not a DigitalOcean image). Default:
 #' \code{'rocker/rstudio'}
 #' @param port (character) Port. Default: \code{8787}
@@ -200,7 +200,7 @@ docklet_docker <- function(droplet, cmd, args = NULL, docker_args = NULL,
 
 #' @export
 #' @rdname docklet_create
-docklet_rstudio <- function(droplet, user = 'rstudio', password = 'rstudio',
+docklet_rstudio <- function(droplet, user = 'rstudio', password = 'server',
   email = '[email protected]', img = 'rocker/rstudio', port = '8787',
   volume = '', dir = '', browse = TRUE, add_users = FALSE,
   ssh_user = "root", keyfile = NULL, ssh_passwd = NULL, verbose = FALSE) {
@@ -236,7 +236,7 @@ docklet_rstudio <- function(droplet, user = 'rstudio', password = 'rstudio',
 #' @export
 #' @rdname docklet_create
 docklet_rstudio_addusers <- function(droplet,
-  user = 'rstudio', password = 'rstudio', img = 'rocker/rstudio',
+  user = 'rstudio', password = 'server', img = 'rocker/rstudio',
   port = '8787', ssh_user = "root", keyfile = NULL, ssh_passwd = NULL, 
   verbose = FALSE) {
 

README.md

@@ -129,7 +129,7 @@ docklet_create() %>%
   docklet_rstudio()
 ```
 
-This will install R, RStudio Server and it's dependencies. It will automatically pop open the RStudio server instance in your default browser, with default `username/password` of `rstudio/rstudio`.
+This will install R, RStudio Server and it's dependencies. It will automatically pop open the RStudio server instance in your default browser, with default `username/password` of `rstudio/server`.
 
 
 ## Meta

inst/ignore/docklet_packrat.R

@@ -13,7 +13,7 @@
 #' d %>% docklet_packrat(".")
 #' }
 docklet_packrat <- function(droplet, project, user = 'rstudio',
-                            password = 'rstudio', verbose = TRUE) {
+                            password = 'server', verbose = TRUE) {
   if (!requireNamespace("packrat", quietly = TRUE)) {
     stop("Please install packrat", call. = FALSE)
   }