rzmk/ckan-devstaller
1
0
Fork 0
mirror of https://github.com/dathere/ckan-devstaller.git synced 2026-03-21 23:40:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update ckan-devstaller to v0.3.1

Browse source
This commit is contained in:
rzmk 2025-10-30 09:10:01 -04:00
parent 0e263202a1
commit 475bcc4932
21 changed files with 240 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -27,6 +27,9 @@ struct Args {
/// Skip interactive steps
#[arg(short, long)]
skip_interactive: bool,
/// Skip running CKAN at the end of installation
#[arg(short, long)]
skip_run: bool,
#[arg(short, long)]
/// CKAN version to install defined by semantic versioning from official releases from https://github.com/ckan/ckan
ckan_version: Option<String>,
@ -110,7 +113,7 @@ rm -rf README ckan-compose ahoy dpp_default_config.ini get-docker.sh permissions
ckan_version: if args.ckan_version.is_some() {
args.ckan_version.unwrap()
} else {
"2.11.3".to_string()
"2.11.4".to_string()
},
sysadmin: default_sysadmin.clone(),
extension_datastore: args
@ -134,7 +137,7 @@ rm -rf README ckan-compose ahoy dpp_default_config.ini get-docker.sh permissions
if config.ssh {
default_config_text.push_str("\n- Install openssh-server to enable SSH access");
}
default_config_text.push_str("\n- Install ckan-compose (https://github.com/tino097/ckan-compose) which sets up the CKAN backend (PostgreSQL, SOLR, Redis)");
default_config_text.push_str("\n- Install ckan-compose (https://github.com/tino097/ckan-compose/tree/ckan-devstaller) which sets up the CKAN backend (PostgreSQL, SOLR, Redis)");
default_config_text.push_str(format!("\n- Install CKAN v{}", config.ckan_version).as_str());
if config.extension_datastore {
default_config_text.push_str("\n- Install the DataStore extension");
@ -281,7 +284,9 @@ rm -rf README ckan-compose ahoy dpp_default_config.ini get-docker.sh permissions
}
println!("\n{}", success_text("Running CKAN instance..."));
cmd!(sh, "ckan -c /etc/ckan/default/ckan.ini run").run()?;
if !args.skip_run {
cmd!(sh, "ckan -c /etc/ckan/default/ckan.ini run").run()?;
}
} else {
println!("Cancelling installation.");
}

4
src/questions.rs
View file

@ -16,7 +16,7 @@ pub fn question_ssh() -> Result<bool> {
}
pub fn question_ckan_version() -> Result<String> {
let ckan_version_options: Vec<&str> = vec!["2.11.3", "2.10.8", "Other"];
let ckan_version_options: Vec<&str> = vec!["2.11.4", "2.10.9", "Other"];
let answer_ckan_version = Select::new(
"What CKAN version would you like to install? (optional)",
ckan_version_options,
@ -26,7 +26,7 @@ pub fn question_ckan_version() -> Result<String> {
if answer_ckan_version == "Other" {
Ok(
Text::new("What CKAN version would you like to install? (optional)")
.with_default("2.11.3")
.with_default("2.11.4")
.prompt()?,
)
} else {

2
src/steps.rs
View file

@ -11,7 +11,7 @@ pub fn step_intro() {
);
println!(
"This installer should assist in setting up {} from a source installation along with ckan-compose. If you have any issues, please report them at https://support.dathere.com or https://github.com/dathere/ckan-devstaller/issues.",
highlighted_text("CKAN 2.11.3")
highlighted_text("CKAN 2.11.4")
);
println!(
"\nYou may also learn more about ckan-devstaller at https://ckan-devstaller.dathere.com."