Merge pull request #136 from ayapapa/issue134

close Issue #134
ayapapa · Oct 4, 2020 · 6d2e419 · 6d2e419
2 parents 3371555 + 93dad92
commit 6d2e419
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 26 deletions.
diff --git a/inst-script/debian/pre-install b/inst-script/debian/pre-install
@@ -38,7 +38,7 @@ apt-get install -y --no-install-recommends `grep -v "^#" inst-script/${OS}/packa
 RUBYNAME=ruby2.3
 apt-get install -y ${RUBYNAME} ${RUBYNAME}-dev
 ruby-switch --set ${RUBYNAME}
-REALLY_GEM_UPDATE_SYSTEM=1 gem update --system
+REALLY_GEM_UPDATE_SYSTEM=1 gem update --system 2.7.10
 
 # SSL
 if [ "${ALM_ENABLE_SSL}" = "y" ]; then

diff --git a/inst-script/rhel6/packages.lst b/inst-script/rhel6/packages.lst
@@ -10,8 +10,8 @@ gettext-devel
 glibc-devel
 httpd
 httpd-devel
-ImageMagick
-ImageMagick-devel
+#ImageMagick
+#ImageMagick-devel
 ipa-pgothic-fonts
 libffi-devel
 libical

diff --git a/inst-script/rhel6/pre-install b/inst-script/rhel6/pre-install
@@ -24,12 +24,19 @@ else
 fi
 yum -y --nogpgcheck install `grep -v "^#" inst-script/${OS}/packages.lst`
 
+# ImageMagick
+yum -y --nogpgcheck install epel-release
+yum -y remove ImageMagick ImageMagick-devel
+rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
+yum --enablerepo=remi -y --nogpgcheck install ImageMagick6 ImageMagick6-devel
+
 # for Jenkins installation
 JENKINS_SYS=${OS}
 
 CHK=`grep Amazon /etc/system-release`
 if [ "${CHK}" != '' ]; then
-  rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
+  #ImageMagickインストール時に、設置済のため、コメントアウト。
+  #rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
   yum  --enablerepo=remi -y --nogpgcheck install mysqlclient16
 fi
 
@@ -57,6 +64,7 @@ source inst-script/${OS}/install-ruby
 # git update
 if [ "${GIT_UPDATE}" = "y" ]; then
   yum remove -y git
-  curl -s https://setup.ius.io/ | bash
-  yum install -y git2u
+  #curl -s https://setup.ius.io/ | bash
+  #yum install -y git2u
+  source inst-script/git_build_install
 fi
diff --git a/inst-script/rhel7/pre-install b/inst-script/rhel7/pre-install
@@ -50,7 +50,8 @@ fi
 # git update
 if [ "${GIT_UPDATE}" = "y" ]; then
   yum remove -y git
-  curl -s https://setup.ius.io/ | bash
-  yum install -y git2u
+  #curl -s https://setup.ius.io/ | bash
+  #yum install -y git2u
+  source inst-script/git_build_install
 fi
 
diff --git a/inst-script/ubuntu1604/pre-install b/inst-script/ubuntu1604/pre-install
@@ -33,7 +33,7 @@ fi
 apt-get -qq update
 apt-get install -y --no-install-recommends `grep -v "^#" inst-script/${OS}/packages.lst`
 
-REALLY_GEM_UPDATE_SYSTEM=1 gem update --system
+REALLY_GEM_UPDATE_SYSTEM=1 gem update --system 2.7.10
 
 # SSL
 if [ "${ALM_ENABLE_SSL}" = "y" ]; then

diff --git a/inst-script/ubuntu1804/pre-install b/inst-script/ubuntu1804/pre-install
@@ -33,7 +33,7 @@ fi
 apt-get -qq update
 apt-get install -y --no-install-recommends `grep -v "^#" inst-script/${OS}/packages.lst`
 
-REALLY_GEM_UPDATE_SYSTEM=1 gem update --system
+REALLY_GEM_UPDATE_SYSTEM=1 gem update --system 2.7.10
 
 # SSL
 if [ "${ALM_ENABLE_SSL}" = "y" ]; then

diff --git a/jenkins/setup/config.sh b/jenkins/setup/config.sh
@@ -132,13 +132,11 @@ echo "## Jenkinsの設定が終わりました。"
 echo "## RedmineユーザーでJenkinsへログインできるようにする場合は、以下を実施してください。"
 echo "## ※ブラウザで表示エラーになる場合は、しばらく待ってから以下を実施してください。"
 echo "## 1. ブラウザでhttp://${ALM_HOSTNAME}/jenkinsを表示"
-echo "## 2. 指示に従い初期設定を実施"
-echo "## 3. 「Jenkinsの管理」→「グローバルセキュリティーの設定」を選択"
-echo "## 4. 「セキュリティを有効化」をチェック"
-echo "## 5. アクセス制御で「Redmineユーザー認証」を選択"
-echo "## 6. 「データベース名」、「DBユーザー」、「DBパスワード」にalminiumと記載"
-echo "## 7. Redmineバージョンで「1.2.0以上」を選択"
-echo "## 8. 「保存」ボタンを押下"
+echo "## 2. 「Jenkinsの管理」→「セキュリティーを設定」を選択"
+echo "## 3. ユーザー情報で「Redmineユーザー認証」を選択"
+echo "## 4. 「データベース名」、「DBユーザー」、「DBパスワード」にalminiumと記載（その他はデフォルト値のまま）"
+echo "## 5. Redmineバージョンで「1.2.0以上」を選択"
+echo "## 6. 「保存」ボタンを押下"
 echo "## インストール処理を継続するために、何らかのキーを押下してください。"
 read PROCEED
 
diff --git a/jenkins/setup/debian/install.sh b/jenkins/setup/debian/install.sh
@@ -19,8 +19,10 @@ else # ubuntu1404より新しいUbuntu
 fi
 
 # download and install jenkins 
-wget -q -O - http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key | sudo apt-key add -
-echo "deb http://pkg.jenkins-ci.org/debian-stable binary/" > /etc/apt/sources.list.d/jenkins.list
+#wget -q -O - http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key | sudo apt-key add -
+wget -q -O - https://pkg.jenkins.io/redhat/jenkins.io.key | sudo apt-key add -
+#echo "deb http://pkg.jenkins-ci.org/debian-stable binary/" > /etc/apt/sources.list.d/jenkins.list
+echo "deb https://pkg.jenkins.io/debian binary/" > /etc/apt/sources.list.d/jenkins.list
 apt-get -q2 update
 apt-get -y install jenkins
 

diff --git a/jenkins/setup/rhel6/install.sh b/jenkins/setup/rhel6/install.sh
@@ -4,8 +4,10 @@
 yum install -y java-1.8.0-openjdk.x86_64
 
 # jenkins
-wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
-rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
+#wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
+wget -O /etc/yum.repos.d/jenkins.repo https://pkg.jenkins.io/redhat/jenkins.repo
+#rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
+rpm --import https://pkg.jenkins.io/redhat/jenkins.io.key
 yum install -y jenkins
 
 rpm -vi --force inst-script/rhel6/mod_auth_mysql-3.0.0-11.el6.1.redmine.x86_64.rpm

diff --git a/jenkins/setup/rhel7/install.sh b/jenkins/setup/rhel7/install.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
-wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
-rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
+#wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
+wget -O /etc/yum.repos.d/jenkins.repo https://pkg.jenkins.io/redhat/jenkins.repo
+#rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
+rpm --import https://pkg.jenkins.io/redhat/jenkins.io.key
 yum install -y jenkins
 
 #sed -i 's/JENKINS_JAVA_OPTIONS="-Djava.awt.headless/JENKINS_JAVA_OPTIONS="-Dhudson.diyChunking=false -Djava.awt.headless/' /etc/sysconfig/jenkins

diff --git a/redmine/Gemfile.local b/redmine/Gemfile.local
@@ -1,2 +1,4 @@
 #gem 'rake-compiler'
 gem 'passenger'
+gem 'sprockets', '~> 3.7.2'
+
diff --git a/redmine/setup/install-plugins b/redmine/setup/install-plugins
@@ -20,7 +20,11 @@ do
     case ${EXT} in
     zip)
         if [ ! -f cache/${FILE_NAME} ]; then
-          wget -P cache ${URL_NAME[$i]}
+          if [[ "${OS}" == "rhel6" ]]; then
+            wget -P cache ${URL_NAME[$i]} --no-check-certificate
+          else
+            wget -P cache ${URL_NAME[$i]}
+          fi
         fi
         yes | unzip -q cache/${FILE_NAME}
          rm -fr ${ALM_INSTALL_DIR}/plugins/${DEST_NAME[$i]}

diff --git a/redmine/setup/redmine-plugins.lst b/redmine/setup/redmine-plugins.lst
@@ -7,9 +7,10 @@
 # アーカイブディレクトリ名はtgz/zipファイルを展開したときのディレクト名
 redmine_wiki_extensions,0.8.1,https://github.com/haru/redmine_wiki_extensions.git
 redmine_xls_export,ALMinium,https://github.com/ayapapa/redmine_xls_export.git
-redmine_plugin_views_revisions,redmine_plugin_views_revisions,http://www.redmine.org/attachments/download/7705/redmine_plugin_views_revisions_v001.zip
+redmine_plugin_views_revisions,redmine_plugin_views_revisions,https://www.redmine.org/attachments/download/7705/redmine_plugin_views_revisions_v001.zip
 #redmine_importer,master,https://github.com/zh/redmine_importer.git
-redmine_importer,master,https://github.com/agileware-jp/redmine_importer.git
+#redmine_importer,master,https://github.com/agileware-jp/redmine_importer.git
+redmine_importer,3.4,https://github.com/agileware-jp/redmine_importer.git
 redmine_code_review,0.9.0,https://github.com/haru/redmine_code_review.git
 #redmine_code_review,master,https://github.com/ayapapa/redmine_code_review.git
 # jenkins関係をここでインストールすると失敗する（別途インストールするようにした）