Skip to content

Commit 0f8c6ac

Browse files
daianamezdreadaianamezdrea
authored
[IAC-1690] - Remove tomcat7 as is EOL (#459)
Remove tomcat7 as is EOL
1 parent 1d78f08 commit 0f8c6ac

File tree

8 files changed

+119
-220
lines changed

8 files changed

+119
-220
lines changed

‎README.md‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The simplest way to get Tomcat up and running with the tomcat module is to insta
4141

4242
```puppet
4343
tomcat::install { '/opt/tomcat':
44-
source_url => 'https://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.x/bin/apache-tomcat-7.0.x.tar.gz',
44+
source_url => 'https://www-us.apache.org/dist/tomcat/tomcat-8/v8.0.x/bin/apache-tomcat-8.0.x.tar.gz',
4545
}
4646
tomcat::instance { 'default':
4747
catalina_home => '/opt/tomcat',
@@ -82,33 +82,6 @@ tomcat::config::server::connector { 'tomcat9-second-http':
8282
},
8383
}
8484
85-
tomcat::install { '/opt/tomcat7':
86-
source_url => 'http://www-eu.apache.org/dist/tomcat/tomcat-7/v7.0.x/bin/apache-tomcat-7.0.x.tar.gz',
87-
}
88-
tomcat::instance { 'tomcat7':
89-
catalina_home => '/opt/tomcat7',
90-
}
91-
# Change tomcat 7's server and HTTP/AJP connectors
92-
tomcat::config::server { 'tomcat7':
93-
catalina_base => '/opt/tomcat7',
94-
port => '8105',
95-
}
96-
tomcat::config::server::connector { 'tomcat7-http':
97-
catalina_base => '/opt/tomcat7',
98-
port => '8180',
99-
protocol => 'HTTP/1.1',
100-
additional_attributes => {
101-
'redirectPort' => '8543'
102-
},
103-
}
104-
tomcat::config::server::connector { 'tomcat7-ajp':
105-
catalina_base => '/opt/tomcat7',
106-
port => '8109',
107-
protocol => 'AJP/1.3',
108-
additional_attributes => {
109-
'redirectPort' => '8543'
110-
},
111-
}
11285
```
11386

11487
> Note: look up the correct version you want to install on the [version list](http://tomcat.apache.org/whichversion.html).

‎examples/instance_with_context.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# This code fragment downloads tomcat 7.0.53, creates an instance and adds a context to localhost
1+
# This code fragment downloads tomcat 8.0.53, creates an instance and adds a context to localhost
22
#
33
class { '::tomcat': }
44
class { '::java': }
55

66
tomcat::instance { 'mycat':
77
catalina_base => '/opt/apache-tomcat/mycat',
8-
source_url => 'http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.tar.gz',
8+
source_url => 'https://downloads.apache.org/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53-deployer.tar.gz',
99
}
1010
-> tomcat::config::server::context { 'mycat-test':
1111
catalina_base => '/opt/apache-tomcat/mycat',

‎examples/instance_with_listener.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# This code fragment downloads tomcat 7.0.53, creates an instance and adds a listener
1+
# This code fragment downloads tomcat 8.0.53, creates an instance and adds a listener
22
#
33
class { '::tomcat': }
44
class { '::java': }
55

66
tomcat::instance { 'mycat':
77
catalina_base => '/opt/apache-tomcat/mycat',
8-
source_url => 'http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.tar.gz',
8+
source_url => 'https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz',
99
}
1010
-> tomcat::config::server::listener { 'mycat-jmx':
1111
catalina_base => '/opt/apache-tomcat/mycat',

‎examples/instance_with_role_and_user.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# This code fragment downloads tomcat 7.0.53, creates an instance and adds a role and user
1+
# This code fragment downloads tomcat 8.0.53, creates an instance and adds a role and user
22
#
33
class { '::tomcat': }
44
class { '::java': }
55

66
tomcat::instance { 'mycat':
77
catalina_base => '/opt/apache-tomcat/mycat',
8-
source_url => 'http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.tar.gz',
8+
source_url => 'https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz',
99
}
1010
-> tomcat::config::server::tomcat_users {
1111
'mycat-role-tester':

‎readmes/README_ja_JP.md‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,6 @@ tomcatモジュールには、[puppetlabs-stdlib](https://forge.puppetlabs.com/p
6161
```bash
6262
puppet module upgrade puppetlabs-stdlib
6363
```
64-
65-
### tomcatを開始する
66-
67-
tomcatモジュールでTomcatを立ち上げる最も簡単な方法は、次のようにTomcatソースをインストールして、サービスを起動することです。
68-
69-
```puppet
70-
tomcat::install { '/opt/tomcat':
71-
source_url => 'https://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.x/bin/apache-tomcat-7.0.x.tar.gz',
72-
}
73-
tomcat::instance { 'default':
74-
catalina_home => '/opt/tomcat',
75-
}
76-
```
77-
7864
> 注: [バージョンリスト](http://tomcat.apache.org/whichversion.html)でインストールするバージョンを照合してください。
7965
8066
## 使用方法
@@ -109,34 +95,6 @@ tomcat::config::server::connector { 'tomcat9-second-http':
10995
},
11096
}
11197
112-
tomcat::install { '/opt/tomcat7':
113-
source_url => 'http://www-eu.apache.org/dist/tomcat/tomcat-7/v7.0.x/bin/apache-tomcat-7.0.x.tar.gz',
114-
}
115-
tomcat::instance { 'tomcat7':
116-
catalina_home => '/opt/tomcat7',
117-
}
118-
# tomcat 7のサーバとHTTP/AJPコネクタを変更
119-
tomcat::config::server { 'tomcat7':
120-
catalina_base => '/opt/tomcat7',
121-
port => '8105',
122-
}
123-
tomcat::config::server::connector { 'tomcat7-http':
124-
catalina_base => '/opt/tomcat7',
125-
port => '8180',
126-
protocol => 'HTTP/1.1',
127-
additional_attributes => {
128-
'redirectPort' => '8543'
129-
},
130-
}
131-
tomcat::config::server::connector { 'tomcat7-ajp':
132-
catalina_base => '/opt/tomcat7',
133-
port => '8109',
134-
protocol => 'AJP/1.3',
135-
additional_attributes => {
136-
'redirectPort' => '8543'
137-
},
138-
}
139-
```
14098
14199
> 注: [バージョンリスト](http://tomcat.apache.org/whichversion.html)でインストールするバージョンを照合してください。
142100

‎spec/acceptance/acceptance_1_readme_spec.rb‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,34 +64,6 @@ class { 'java': }
6464
'redirectPort' => '8443'
6565
},
6666
}
67-
68-
tomcat::install { '/opt/tomcat7':
69-
source_url => '#{TOMCAT7_RECENT_SOURCE}',
70-
}
71-
tomcat::instance { 'tomcat7':
72-
catalina_home => '/opt/tomcat7',
73-
}
74-
# Change tomcat 7's server and HTTP/AJP connectors
75-
tomcat::config::server { 'tomcat7':
76-
catalina_base => '/opt/tomcat7',
77-
port => '8105',
78-
}
79-
tomcat::config::server::connector { 'tomcat7-http':
80-
catalina_base => '/opt/tomcat7',
81-
port => '8180',
82-
protocol => 'HTTP/1.1',
83-
additional_attributes => {
84-
'redirectPort' => '8543'
85-
},
86-
}
87-
tomcat::config::server::connector { 'tomcat7-ajp':
88-
catalina_base => '/opt/tomcat7',
89-
port => '8109',
90-
protocol => 'AJP/1.3',
91-
additional_attributes => {
92-
'redirectPort' => '8543'
93-
},
94-
}
9567
MANIFEST
9668
it 'applies the manifest without error' do
9769
apply_manifest(pp, catch_failures: true, acceptable_exit_codes: [0, 2])
@@ -110,7 +82,7 @@ class { 'java': }
11082
run_shell('rm -rf /opt/tomcat*', expect_failures: true)
11183
run_shell('rm -rf /opt/apache-tomcat*', expect_failures: true)
11284
end
113-
{ '7' => TOMCAT7_RECENT_SOURCE, '8' => TOMCAT8_RECENT_SOURCE, '9' => TOMCAT9_RECENT_SOURCE }.each do |key, value|
85+
{ '8' => TOMCAT8_RECENT_SOURCE, '9' => TOMCAT9_RECENT_SOURCE }.each do |key, value|
11486
context "when tomcat #{key} is installed remove_default_webapps => ['docs', 'examples']" do
11587
install_tomcat = <<-MANIFEST
11688
tomcat::install { '/opt/tomcat#{key}':

0 commit comments

Comments
 (0)