From 1a7e0986444ebc648c4ddfa59b5a45947d0ad770 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 24 Aug 2023 23:09:58 +0200 Subject: [PATCH] CT mysql, jenkins: Fixed Typo in First run scripts --- CT-Files/jenkins/Scripts/FirstRun.sh | 6 +++--- CT-Files/mysql/Scripts/FirstRun.sh | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CT-Files/jenkins/Scripts/FirstRun.sh b/CT-Files/jenkins/Scripts/FirstRun.sh index 08003cb..cac6114 100644 --- a/CT-Files/jenkins/Scripts/FirstRun.sh +++ b/CT-Files/jenkins/Scripts/FirstRun.sh @@ -8,7 +8,7 @@ LXCBuilderIP= #StaticVars AdminPassword=$(cat /var/lib/jenkins/secrets/initialAdminPassword) -JeninsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup pipeline-stage-view custom-checkbox-parameter parameterized-scheduler" +JenkinsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup pipeline-stage-view custom-checkbox-parameter parameterized-scheduler" #Check if script is configured if [ $ThisScriptConfigured = no ]; then @@ -19,7 +19,7 @@ fi #Download Jenkins-CLI tool curl localhost:8080/jnlpJars/jenkins-cli.jar -o /opt/jenkins-cli.jar #Install Plugins -java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword install-plugin $JeninsPlugins +java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword install-plugin $JenkinsPlugins echo "jenkins.model.Jenkins.instance.securityRealm.createAccount(\"$JenkinsUsername\", \"$JenkinsPassword\")" | java -jar /opt/jenkins-cli.jar -s "http://localhost:8080" -webSocket -auth admin:$AdminPassword groovy = – #Installed plugin versions @@ -53,4 +53,4 @@ java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin: java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Debian-LXC java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Alpine-LXC echo "Debian-LXC and Alpine-LXC build will fail, this is expected behaviour" -echo "Next step is to login to the jenins instance, update the credentials for the Node and delete the admin user" \ No newline at end of file +echo "Next step is to login to the Jenkins instance, update the credentials for the Node and delete the admin user" \ No newline at end of file diff --git a/CT-Files/mysql/Scripts/FirstRun.sh b/CT-Files/mysql/Scripts/FirstRun.sh index 3e6a30b..398fa68 100644 --- a/CT-Files/mysql/Scripts/FirstRun.sh +++ b/CT-Files/mysql/Scripts/FirstRun.sh @@ -4,7 +4,6 @@ echo #StaticVars TempPassword=$(cat /opt/Setup/TempMysqlPasswd) -JeninsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup" #Configure PhpMyAdmin mysql -u root --password="$TempPassword" < /opt/PhpMyAdmin/sql/create_tables.sql