Compare commits

...

450 Commits

Author SHA1 Message Date
650e7201b1 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2023-11-01 14:30:33 -04:00
d8b4c89fd0 Merge branch 'acs-aims' into acs-aims-enterprise 2023-11-01 14:30:10 -04:00
48859f80ee fixed AIS URL 2023-11-01 14:28:26 -04:00
6f1acad7b6 Merge branch 'acs-frontend' into acs-aims 2023-11-01 14:28:01 -04:00
aa2aceb8ed Merge branch 'acs-backend' into acs-frontend 2023-11-01 14:25:55 -04:00
faa633c46c Merge branch 'acs-lats' into acs-backend 2023-11-01 14:25:01 -04:00
72026e2ad2 Merge branch 'acs-search' into acs-backend 2023-11-01 14:24:57 -04:00
ab44e01638 Merge branch 'acs' into acs-lats 2023-11-01 14:23:23 -04:00
b3c89aa9ce Merge branch 'acs' into acs-search 2023-11-01 14:23:12 -04:00
fbda2bcdde configure CORS in ACS 2023-11-01 14:21:02 -04:00
293d5cdf36 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2023-11-01 10:45:53 -04:00
d7c7ba0c69 Merge branch 'acs-aims' into acs-aims-enterprise 2023-11-01 10:42:32 -04:00
a6797d5550 Merge branch 'aims' into acs-aims 2023-11-01 10:36:24 -04:00
b211d1ea8a fix well-known reporting 2023-11-01 10:35:56 -04:00
d6149bc87e Merge branch 'ags-frontend-enterprise' into ags-aims-enterprise 2023-10-26 14:47:36 -04:00
8462b9dbe2 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2023-10-26 14:47:03 -04:00
2ec9112310 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2023-10-26 14:44:38 -04:00
3be3cb0671 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2023-10-26 14:44:33 -04:00
1149792321 Merge branch 'ags-enterprise' into ags-backend-enterprise 2023-10-26 14:43:37 -04:00
d23afd274c Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-26 14:43:33 -04:00
c088f81a2b Merge branch 'acs-enterprise' into ags-enterprise 2023-10-26 14:42:48 -04:00
5fc2127922 Merge branch 'ags' into ags-enterprise 2023-10-26 14:42:39 -04:00
31a89f370d Merge branch 'acs' into ags 2023-10-26 14:41:42 -04:00
5843c64876 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2023-10-26 14:38:13 -04:00
f81076d26d Merge branch 'acs-frontend' into acs-frontend-enterprise 2023-10-26 14:37:45 -04:00
2aa2cf6f64 Merge branch 'acs-backend' into acs-frontend 2023-10-26 14:35:58 -04:00
0949d12d8f Merge branch 'acs-search' into acs-backend-enterprise 2023-10-26 14:35:02 -04:00
1b23093930 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2023-10-26 14:34:56 -04:00
91e13fa81a Merge branch 'acs-enterprise' into acs-ats-enterprise 2023-10-26 14:31:57 -04:00
0b18c583da Merge branch 'acs-lats' into acs-backend 2023-10-26 14:29:07 -04:00
40dd43068d Merge branch 'acs-search' into acs-backend 2023-10-26 14:29:04 -04:00
c0878c27f0 Merge branch 'acs' into acs-enterprise 2023-10-26 14:28:44 -04:00
231f11ea05 Merge branch 'acs' into acs-lats 2023-10-26 14:28:24 -04:00
bae1c47984 Merge branch 'acs' into acs-search 2023-10-26 14:27:39 -04:00
3581872511 Merge branch 'acs-aims' into acs-aims-enterprise 2023-10-26 14:25:22 -04:00
bcf68b4027 Merge branch 'aims' into acs-aims 2023-10-26 14:24:54 -04:00
885e53df2a Merge branch 'acs' into acs-aims 2023-10-26 14:24:38 -04:00
f456bb7ea9 removed mem_limit from proxy 2023-10-26 14:15:11 -04:00
df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
aa136e1f2f added license file README 2023-10-26 08:50:32 -04:00
10f1a9f359 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2023-10-25 22:38:38 -04:00
f90259eae9 Merge branch 'ags-frontend-enterprise' into ags-aims-enterprise 2023-10-25 22:38:12 -04:00
544029478a Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2023-10-25 22:35:58 -04:00
854bd252e2 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2023-10-25 22:35:34 -04:00
9a0a428bbd Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2023-10-25 22:31:26 -04:00
1732253d8f Merge branch 'acs-aims' into acs-aims-enterprise 2023-10-25 22:30:39 -04:00
350380fb3d Merge branch 'acs-frontend' into acs-aims 2023-10-25 22:29:48 -04:00
9427e0e1cb Merge branch 'aims' into acs-aims 2023-10-25 22:29:17 -04:00
61ef62ecb1 Merge branch 'ags-enterprise' into ags-backend-enterprise 2023-10-25 22:27:15 -04:00
5429c03548 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-25 22:26:52 -04:00
fa90205f6f Merge branch 'ags' into ags-enterprise 2023-10-25 22:26:23 -04:00
3d4f0640ab Merge branch 'acs-enterprise' into ags-enterprise 2023-10-25 22:26:19 -04:00
8a53f02159 Merge branch 'acs' into ags 2023-10-25 22:23:25 -04:00
51e5b376c1 Merge branch 'acs-adw-base' into acs-frontend-enterprise 2023-10-25 22:13:57 -04:00
37ec00fd9d Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2023-10-25 22:13:38 -04:00
3a967c28d6 Merge branch 'acs-frontend' into acs-frontend-enterprise 2023-10-25 22:12:12 -04:00
df81075066 Merge branch 'acs-backend' into acs-frontend 2023-10-25 22:09:59 -04:00
890f8ac11a Merge branch 'acs-share-base' into acs-frontend 2023-10-25 22:09:09 -04:00
1f1e10cd9c Merge branch 'acs-sync-base' into acs-backend-enterprise 2023-10-25 21:53:02 -04:00
3202dc9e51 Merge branch 'acs-search' into acs-backend-enterprise 2023-10-25 21:52:34 -04:00
aa6c6e54b6 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2023-10-25 21:51:52 -04:00
f5b11e4a48 Merge branch 'acs-ats-base' into acs-ats-enterprise 2023-10-25 21:50:29 -04:00
a52eb3403f Merge branch 'acs-enterprise' into acs-ats-enterprise 2023-10-25 21:49:34 -04:00
38b5f8dc36 Merge branch 'acs' into acs-enterprise 2023-10-25 21:47:34 -04:00
664a47f49c Merge branch 'acs-lats' into acs-backend 2023-10-25 21:45:51 -04:00
020c4822fd Merge branch 'acs-search' into acs-backend 2023-10-25 21:45:36 -04:00
105b34664a Merge branch 'acs-lats-base' into acs-lats 2023-10-25 21:43:40 -04:00
59c87eb302 added solr health check 2023-10-25 20:37:32 -04:00
8c875fe850 Merge branch 'acs-search-base' into acs-search 2023-10-25 20:30:58 -04:00
c3880ac43d ADW v4.1.0 2023-10-25 20:28:03 -04:00
a1bd61bdde Merge branch 'acs-base' into acs-adw-base 2023-10-25 20:27:33 -04:00
b17f702f05 Merge branch 'acs-base' into acs-ats-base 2023-10-25 20:26:08 -04:00
c3f695ae8b Merge branch 'ats-base' into acs-ats-base 2023-10-25 20:25:48 -04:00
415994f1f3 ATE AIO v4.0.0 2023-10-25 20:23:36 -04:00
9a93ec369c Merge branch 'acs-base' into acs-lats-base 2023-10-25 20:23:20 -04:00
81ca2ed038 ACS search 2.0.8.2 2023-10-25 20:21:21 -04:00
51b777c0c5 Merge branch 'acs-base' into acs-search-base 2023-10-25 20:19:55 -04:00
23b3057329 ACS share v7.4.1.2 2023-10-25 20:19:43 -04:00
b009fa9219 Merge branch 'acs-base' into acs-share-base 2023-10-25 20:17:55 -04:00
f5c4b00a02 ACS sync v3.9.0 2023-10-25 20:17:44 -04:00
9e4577222b Merge branch 'acs-base' into acs-sync-base 2023-10-25 20:16:30 -04:00
ef221d9c7a Merge branch 'acs-base' into acs 2023-10-25 20:11:38 -04:00
57af0a20b1 ACS v7.4.1.1 2023-10-25 20:11:15 -04:00
76e4287aa1 Merge branch 'proxy' into acs-base 2023-10-25 20:08:28 -04:00
9afc703a2c AIS v1.8.0.1 2023-10-25 20:02:33 -04:00
416fe88c6b Merge branch 'proxy' into aims 2023-10-25 18:27:08 -04:00
2b14374993 updated ATS versions 2023-10-25 18:25:49 -04:00
a4cfbd0b14 Merge branch 'base' into ats-base 2023-10-25 18:18:30 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
4988944cad Merge branch 'ags-frontend-enterprise' into ags-aims-enterprise 2022-11-01 17:54:06 -04:00
2560dcf1c8 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2022-11-01 17:53:38 -04:00
5109b34641 Merge branch 'acs-aims' into acs-aims-enterprise 2022-11-01 17:52:08 -04:00
cd1d2e08b7 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2022-11-01 17:51:14 -04:00
9114da403b Merge branch 'aims' into acs-aims 2022-11-01 17:47:43 -04:00
8e6eb7ae72 Merge branch 'acs-frontend' into acs-aims 2022-11-01 17:47:14 -04:00
ff3554c0ce parameterized AIS version 2022-11-01 17:45:46 -04:00
cc77feb9b6 Merge branch 'proxy' into aims 2022-11-01 17:44:59 -04:00
3cd95d4759 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2022-11-01 17:38:59 -04:00
452ff6975d parameterized ACS Share version 2022-11-01 17:38:25 -04:00
a8bc1e6d94 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2022-11-01 17:37:30 -04:00
6002fcaef2 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2022-11-01 17:30:10 -04:00
66b3e49873 Merge branch 'ags-enterprise' into ags-backend-enterprise 2022-11-01 17:29:30 -04:00
4336b63b85 Merge branch 'acs-enterprise' into ags-enterprise 2022-11-01 17:23:04 -04:00
df0a91920b Merge branch 'ags' into ags-enterprise 2022-11-01 17:22:19 -04:00
18889ab89d Merge branch 'acs' into ags 2022-11-01 17:20:40 -04:00
117982a0ac Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2022-11-01 16:53:55 -04:00
f139716d25 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2022-11-01 16:52:44 -04:00
49d2647ab6 Merge branch 'acs-ats-base' into acs-ats-enterprise 2022-11-01 16:52:20 -04:00
04b394c31c Merge branch 'ats-base' into acs-ats-base 2022-11-01 16:51:54 -04:00
fbbed5946f fixed ASFS docker image path 2022-11-01 16:51:30 -04:00
450fb7c769 Merge branch 'acs-adw-base' into acs-frontend-enterprise 2022-11-01 16:40:30 -04:00
db0da17798 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2022-11-01 16:39:53 -04:00
693aa9e4bf Merge branch 'acs-frontend' into acs-frontend-enterprise 2022-11-01 16:37:49 -04:00
8bc64cd881 Merge branch 'acs-search' into acs-backend-enterprise 2022-11-01 16:34:46 -04:00
9f0f5868bd Merge branch 'acs-sync-base' into acs-backend-enterprise 2022-11-01 16:33:37 -04:00
9b3ed9fbbd Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2022-11-01 16:31:02 -04:00
3283969431 Merge branch 'acs-ats-base' into acs-ats-enterprise 2022-11-01 16:29:43 -04:00
bc91054eeb Merge branch 'acs-enterprise' into acs-ats-enterprise 2022-11-01 16:28:26 -04:00
8fd11ed1d6 Merge branch 'acs' into acs-enterprise 2022-11-01 16:26:33 -04:00
7fd04f30f3 Merge branch 'acs-share-base' into acs-frontend 2022-11-01 16:23:43 -04:00
226a2d05e2 Merge branch 'acs-backend' into acs-frontend 2022-11-01 16:22:46 -04:00
c60e224a14 Merge branch 'acs-lats' into acs-backend 2022-11-01 16:17:27 -04:00
fc74faf57a Merge branch 'acs-search' into acs-backend 2022-11-01 16:16:59 -04:00
da933f2aa7 Merge branch 'acs' into acs-lats 2022-11-01 16:15:28 -04:00
10aa561c52 Merge branch 'acs-lats-base' into acs-lats 2022-11-01 16:11:15 -04:00
2dc64b23e4 parameterized LATS version 2022-11-01 16:09:56 -04:00
e9186dec84 Merge branch 'acs-base' into acs-lats-base 2022-11-01 16:08:01 -04:00
d556040909 Merge branch 'acs' into acs-search 2022-11-01 16:05:53 -04:00
64f85da579 Merge branch 'acs-search-base' into acs-search 2022-11-01 16:04:44 -04:00
7113aa012f parameterized the ADW version 2022-11-01 15:36:33 -04:00
d4426fe373 Merge branch 'acs-base' into acs-adw-base 2022-11-01 15:32:54 -04:00
831f1cb4f0 Merge branch 'acs-base' into acs-ats-base 2022-11-01 15:32:08 -04:00
0e5181d12a Merge branch 'ats-base' into acs-ats-base 2022-11-01 15:30:48 -04:00
f569d712e1 parameterize Docker image versions 2022-11-01 15:30:07 -04:00
ffac352049 Merge branch 'base' into ats-base 2022-11-01 15:11:57 -04:00
9899d03da9 parameterized ASIE version; enabled secret comms 2022-11-01 15:07:51 -04:00
5b4069427e Merge branch 'acs-base' into acs-search-base 2022-11-01 15:04:21 -04:00
fcd1262721 parameterized ACS share version 2022-11-01 15:03:04 -04:00
d7de714eeb Merge branch 'acs-base' into acs-share-base 2022-11-01 15:01:38 -04:00
b3a9145dd6 parameterized sync service version 2022-11-01 15:00:53 -04:00
08ce9f6cc8 Merge branch 'acs-base' into acs-sync-base 2022-11-01 14:57:20 -04:00
7511eba729 added memory limit 2022-11-01 14:54:47 -04:00
173de2375e Merge branch 'acs-base' into acs 2022-11-01 14:52:59 -04:00
8e3301877a parameterized docker image tags 2022-11-01 14:51:11 -04:00
8b4e45c2e2 Merge branch 'proxy' into acs-base 2022-11-01 14:49:06 -04:00
9e1a819e8b Merge branch 'base' into proxy 2022-11-01 14:48:11 -04:00
481e1bb38d Merge branch 'acs-base' into acs 2022-11-01 14:22:57 -04:00
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -04:00
6d3ca92357 Merge branch 'ags-frontend-enterprise' into ags-aims-enterprise 2021-07-30 16:50:04 -04:00
54fcdf31b8 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-07-30 16:49:48 -04:00
db1917fa40 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2021-07-30 16:49:29 -04:00
3afa0cdc33 Merge branch 'acs-aims' into acs-aims-enterprise 2021-07-30 16:48:56 -04:00
52c8e24b3a Merge remote-tracking branch 'origin/acs-frontend' into acs-aims 2021-07-30 16:46:22 -04:00
c8540ca0de Merge branch 'aims' into acs-aims 2021-07-30 16:45:59 -04:00
279eb2af9d updated AIS memory limit mins 2021-07-30 16:44:23 -04:00
0d379094e9 updated AIS to v1.4.0 2021-07-30 16:44:11 -04:00
f752309a26 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-07-30 16:26:07 -04:00
8fb8be7443 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-07-30 16:25:57 -04:00
c614f75948 Merge branch 'acs-frontend' into acs-frontend-enterprise 2021-07-30 16:25:22 -04:00
4b9d5b2d89 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-07-30 16:21:50 -04:00
8c7e433358 Merge branch 'acs-backend' into acs-frontend 2021-07-30 16:15:19 -04:00
5b62436d30 Merge branch 'ags-enterprise' into ags-backend-enterprise 2021-07-30 16:13:32 -04:00
f66c710a6e Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-07-30 16:13:27 -04:00
184c1bb158 Merge branch 'ags' into ags-enterprise 2021-07-30 16:11:27 -04:00
d0e042a9c1 Merge branch 'acs-enterprise' into ags-enterprise 2021-07-30 16:09:20 -04:00
3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
daf1d74b66 Merge branch 'acs-search' into acs-backend-enterprise 2021-07-30 16:05:57 -04:00
69b04183bb Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2021-07-30 16:05:42 -04:00
0662ca345f added ATS memory limit mins 2021-07-30 16:02:01 -04:00
874f04c305 Merge branch 'acs-enterprise' into acs-ats-enterprise 2021-07-30 15:59:59 -04:00
0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -04:00
da93d4ea48 increased AGS platform memory limit min 2021-07-30 15:55:53 -04:00
01a5d97ed7 Merge branch 'acs' into ags 2021-07-30 15:55:20 -04:00
ad948f3f08 Merge branch 'acs' into acs-enterprise 2021-07-30 15:54:12 -04:00
979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00
b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
3ca58472a3 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-06-22 09:25:11 -04:00
8894180ea1 changed URLs to use split envvars 2021-06-22 09:24:40 -04:00
7b0dd55b4e Merge branch 'acs-aims' into acs-aims-enterprise 2021-06-22 09:23:46 -04:00
dfb0f61088 changed URLs to use split envvars 2021-06-22 09:23:05 -04:00
1a0d8ba2b2 Merge branch 'aims' into acs-aims 2021-06-22 09:13:03 -04:00
a7fa111930 split AIS url into parts for reuse 2021-06-22 09:11:00 -04:00
65a2d15c07 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-05-06 14:19:24 -04:00
bb6c28f859 Merge branch 'acs-aims' into acs-aims-enterprise 2021-05-06 14:19:17 -04:00
171f67daf0 added identity service as dependency to platform 2021-05-06 14:18:02 -04:00
d47e68fc70 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-05-06 14:15:54 -04:00
7fbe8b5c1f Merge branch 'acs-aims' into acs-aims-enterprise 2021-05-06 14:15:01 -04:00
db6c0f84a9 Merge branch 'aims' into acs-aims 2021-05-06 14:14:17 -04:00
b238e3c727 added identity service healthcheck 2021-05-06 14:13:12 -04:00
0ab7ab7a49 Merge remote-tracking branch 'origin/ags-frontend-enterprise' into ags-aims-enterprise 2021-04-02 10:38:09 -04:00
575aff046e Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-04-02 10:38:02 -04:00
18d337ffa0 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2021-04-02 10:37:36 -04:00
brian
e86f9b6237 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-04-02 10:34:43 -04:00
f90a541ec2 fixed dup service 2021-04-02 10:31:35 -04:00
7d3d00edb2 Merge remote-tracking branch 'origin/ags-frontend-enterprise' into ags-aims-enterprise 2021-04-02 09:32:35 -04:00
33035fb718 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-04-02 09:32:07 -04:00
ce372ad731 Merge branch 'acs-aims' into acs-aims-enterprise 2021-04-02 09:31:27 -04:00
75476c4d4e Merge remote-tracking branch 'origin/acs-frontend-enterprise' into acs-aims-enterprise 2021-04-02 09:31:11 -04:00
brian
d15d9d291c Merge branch 'aims' into acs-aims 2021-04-02 09:21:23 -04:00
brian
ec79404d1c Merge branch 'acs-frontend' into acs-aims 2021-04-02 09:21:23 -04:00
brian
84feaff8e3 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-04-02 09:21:13 -04:00
brian
3b7770e16d Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-04-02 09:21:12 -04:00
brian
f52aee275e Merge branch 'acs-frontend' into acs-frontend-enterprise 2021-04-02 09:20:56 -04:00
brian
c2c340f61e Merge branch 'acs-adw-base' into acs-frontend-enterprise 2021-04-02 09:20:55 -04:00
c9d1646933 Merge remote-tracking branch 'origin/acs-backend-enterprise' into acs-frontend-enterprise 2021-04-02 09:20:11 -04:00
brian
26adfeee1c Merge branch 'acs-backend' into acs-frontend 2021-04-02 09:14:46 -04:00
brian
68d0eeab49 Merge branch 'acs-share-base' into acs-frontend 2021-04-02 09:14:46 -04:00
brian
a50c3da468 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-04-02 09:14:39 -04:00
brian
f8638e7a26 Merge branch 'ags-enterprise' into ags-backend-enterprise 2021-04-02 09:14:38 -04:00
brian
4d584785ff Merge branch 'ags' into ags-enterprise 2021-04-02 09:14:31 -04:00
brian
96987b7ff1 Merge branch 'acs-enterprise' into ags-enterprise 2021-04-02 09:14:31 -04:00
brian
456950f31d Merge branch 'acs-lats' into acs-backend 2021-04-02 09:14:29 -04:00
brian
6740f23779 Merge branch 'acs-search' into acs-backend 2021-04-02 09:14:28 -04:00
brian
880221a953 Merge branch 'acs-lats-base' into acs-lats 2021-04-02 09:14:00 -04:00
brian
398d6692f8 Merge branch 'acs' into acs-lats 2021-04-02 09:13:59 -04:00
brian
b6f2befafb Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2021-04-02 09:13:57 -04:00
brian
c11990900c Merge branch 'acs-sync-base' into acs-backend-enterprise 2021-04-02 09:13:56 -04:00
brian
e07cea5ffa Merge branch 'acs-search' into acs-backend-enterprise 2021-04-02 09:13:54 -04:00
brian
6e09a9c0c9 Merge branch 'acs' into ags 2021-04-02 09:13:52 -04:00
brian
29f4ca7c54 Merge branch 'acs-ats-base' into acs-ats-enterprise 2021-04-02 09:13:50 -04:00
brian
73fea3d13d Merge branch 'acs-enterprise' into acs-ats-enterprise 2021-04-02 09:13:49 -04:00
brian
910cc2e2cb Merge branch 'acs' into acs-enterprise 2021-04-02 09:13:44 -04:00
brian
99d39fa7f7 Merge branch 'acs-search-base' into acs-search 2021-04-02 09:13:42 -04:00
brian
1778fd04a4 Merge branch 'acs' into acs-search 2021-04-02 09:13:41 -04:00
brian
d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
brian
a72d43a6af Merge branch 'acs-base' into acs-search-base 2021-04-02 09:13:30 -04:00
brian
5a16e389c4 Merge branch 'acs-base' into acs-lats-base 2021-04-02 09:13:25 -04:00
brian
f10722dec9 Merge branch 'acs-base' into acs-sync-base 2021-04-02 09:13:22 -04:00
brian
ec00d1a445 Merge branch 'acs-base' into acs-adw-base 2021-04-02 09:13:18 -04:00
brian
bf09b85448 Merge branch 'acs-base' into acs-share-base 2021-04-02 09:13:10 -04:00
brian
f23cda3fd1 Merge branch 'proxy' into aims 2021-04-02 09:12:59 -04:00
39928d09fc Merge branch 'ats-base' into acs-ats-base 2021-04-02 09:11:32 -04:00
9859e68fe8 Merge branch 'acs-base' into acs-ats-base 2021-04-02 09:11:22 -04:00
4dccd7892f Merge branch 'base' into ats-base 2021-04-02 09:09:13 -04:00
6bce626075 Merge branch 'proxy' into acs-base 2021-04-02 08:42:43 -04:00
3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
192bd41c1a Merge remote-tracking branch 'origin/ags-frontend-enterprise' into ags-aims-enterprise 2021-01-14 14:26:04 -05:00
brian
c76e745e2d Merge branch 'acs-aims' into acs-aims-enterprise 2021-01-14 11:41:14 -05:00
brian
fd79be4aed Merge branch 'aims' into acs-aims 2021-01-14 11:41:09 -05:00
b4be2e251c changed admin username ot alfresco defaults 2021-01-14 11:40:42 -05:00
dc236b7550 added sync/adw config after testing 2021-01-14 11:20:05 -05:00
d87935cd44 Merge branch 'acs-aims' into acs-aims-enterprise 2021-01-14 11:19:10 -05:00
0be038fe07 added acs platform/share AIMS config after testing 2021-01-14 11:19:01 -05:00
25d0633fdb Merge branch 'aims' into acs-aims 2021-01-14 11:17:08 -05:00
44b6f26f4f updates after some acs-enterprise testing 2021-01-14 11:17:01 -05:00
a388c1d2fb Merge branch 'acs-aims' into acs-aims-enterprise 2021-01-14 09:41:20 -05:00
ca420b43e2 added aims config to platform/share 2021-01-14 09:40:28 -05:00
8be7673ad3 Merge branch 'aims' into acs-aims 2021-01-14 09:39:54 -05:00
b124cd027c added default admin.1 user 2021-01-14 09:39:34 -05:00
af39f367b6 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2021-01-13 20:55:01 -05:00
brian
c5f2448cf9 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 20:52:40 -05:00
6471292c34 added share proxy to adw 2021-01-13 18:19:06 -05:00
7114bb5de1 Merge branch 'acs-adw-base' into acs-frontend-enterprise 2021-01-13 18:18:28 -05:00
5ea48c405f added host-based config 2021-01-13 18:14:24 -05:00
brian
00335f5795 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2021-01-13 17:38:59 -05:00
brian
806601c800 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-01-13 17:38:46 -05:00
brian
e9542dbc96 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 17:38:45 -05:00
brian
e222fc3fba Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 17:38:42 -05:00
brian
eaa6f1025d Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 17:38:37 -05:00
3b5fc8c096 fixed sync service config 2021-01-13 17:35:43 -05:00
8aa7067286 Merge remote-tracking branch 'origin/acs-frontend-enterprise' into acs-aims-enterprise 2021-01-13 17:22:01 -05:00
77f2c5e0f1 Merge branch 'aims' into acs-aims 2021-01-13 17:15:32 -05:00
919d842d61 added identity service 2021-01-13 17:01:06 -05:00
brian
75afb1580b Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:55:43 -05:00
41858ebddb added ADW version and config 2021-01-13 11:47:27 -05:00
6aa7c2229d Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:38:30 -05:00
5788051f22 Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise 2021-01-13 11:36:13 -05:00
b534456065 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 11:28:54 -05:00
f977291894 using AGS share-enterprise container 2021-01-13 11:22:01 -05:00
cc4ed62159 Merge remote-tracking branch 'origin/acs-adw-base' into ags-frontend-enterprise 2021-01-13 11:21:00 -05:00
e8a8d088f4 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-01-13 11:19:08 -05:00
c9075398cd Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 11:17:17 -05:00
128a289ac3 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:12:52 -05:00
ac7e691100 Merge branch 'acs-sync-base' into acs-backend-enterprise 2021-01-13 11:09:18 -05:00
15ccb5642b using proxy values for sync url 2021-01-13 09:59:21 -05:00
4349851dd9 Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise 2021-01-13 09:56:54 -05:00
de8920ba0b Merge remote-tracking branch 'origin/acs-frontend' into acs-frontend-enterprise 2021-01-13 09:50:51 -05:00
4f5a939b71 Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 09:47:53 -05:00
22b2583505 Merge branch 'acs-enterprise' into ags-enterprise 2021-01-13 09:45:50 -05:00
9b3ba22ca1 Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search 2021-01-06 16:33:19 -05:00
69531bde6d Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend 2021-01-06 16:29:12 -05:00
766b2ebfd0 Merge branch 'acs-share-base.acs-base' into acs-frontend.acs-share-base 2021-01-06 16:28:51 -05:00
0999563353 Merge branch 'acs.acs-base' into ags.acs 2021-01-06 16:27:44 -05:00
078b2ae35c Merge branch 'acs-lats.acs' into acs-backend.acs-lats 2021-01-06 16:27:31 -05:00
5ff71f0e3c Merge branch 'acs-search.acs' into acs-backend.acs-search 2021-01-06 16:27:17 -05:00
2878298644 Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base 2021-01-06 16:26:04 -05:00
11bb8c62ed Merge branch 'acs.acs-base' into acs-search.acs 2021-01-06 16:24:47 -05:00
30f3420ee5 Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base 2021-01-06 16:24:29 -05:00
677a3e1dc8 Merge branch 'acs.acs-base' into acs-lats.acs 2021-01-06 16:24:01 -05:00
76dc8c7ad9 Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base 2021-01-06 16:22:31 -05:00
b024fd8d7e Merge branch 'ats-base.base' into acs-ats-base.ats-base 2021-01-06 16:21:36 -05:00
8a36f91d06 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2021-01-06 16:15:41 -05:00
2ec11a1135 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2021-01-06 16:12:46 -05:00
962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
3ef69c527b Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2021-01-06 15:54:53 -05:00
a56556b596 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2021-01-06 15:54:27 -05:00
0a0cb15580 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2021-01-06 15:54:12 -05:00
d3b41dcc46 Merge branch 'base' into ats-base.base 2021-01-06 15:53:29 -05:00
37de03317b Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise 2021-01-06 15:40:03 -05:00
dc9fb0abfa added license dir 2021-01-06 15:39:29 -05:00
68dc071342 configured ACS for ATS 2021-01-06 15:36:32 -05:00
78ec9c2a94 Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base 2021-01-06 15:25:16 -05:00
cafee75cdc set platform to v6.2.2.3 2021-01-06 15:21:05 -05:00
d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
9e2ce6b967 Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2021-01-06 12:29:24 -05:00
295b0711b0 Merge branch 'acs-community.acs-base' into ags-community.acs-community 2021-01-06 12:24:10 -05:00
e660d79ef1 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2021-01-06 12:23:49 -05:00
f036e13180 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2021-01-06 12:23:35 -05:00
83db2b08dc Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2021-01-06 12:23:18 -05:00
40207d43ff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2021-01-06 12:22:58 -05:00
a3cb815dd1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2021-01-06 12:22:27 -05:00
ebd6c503bd Merge branch 'proxy.base' into acs-base.proxy 2021-01-06 12:21:58 -05:00
ac18d6d637 fixed host/protocol URL rewrites 2021-01-06 12:21:21 -05:00
a0c6074358 Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2021-01-06 10:45:33 -05:00
4afdf95b44 added share context to share config 2021-01-06 10:45:23 -05:00
bc6a8539f3 switched platform to AGS (not AMP module distributed anymore) 2021-01-06 10:24:47 -05:00
b3001c56ff Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2020-12-26 15:10:45 -05:00
89ffe20aee added CSRF 2020-12-26 15:10:13 -05:00
d4f4b6217e Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2020-12-26 14:22:18 -05:00
41b87a9e5e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-26 14:20:33 -05:00
86ad2bc409 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-26 14:20:12 -05:00
2a56247aa1 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-26 14:18:48 -05:00
efb9210c5a Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-26 14:18:31 -05:00
48d46aa70c Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-26 14:18:13 -05:00
b47583a716 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-26 14:15:39 -05:00
fc9c26eac5 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-26 14:02:30 -05:00
2715b3afea Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 14:00:14 -05:00
55b70f1a36 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:58:15 -05:00
f2ac689f85 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:56:13 -05:00
1d5624496d renamed proxy variables to match changes to proxy branch 2020-12-26 13:55:19 -05:00
3a6b5c4850 Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy 2020-12-26 13:54:44 -05:00
817b062dfd merged platform/share into single proxy 2020-12-26 13:54:31 -05:00
2367651a7e added share context removed from acs-base 2020-12-26 13:52:17 -05:00
b8b267d4c5 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:51:34 -05:00
c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -05:00
253b7fd3f2 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-26 13:50:37 -05:00
9f75b4439d Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 13:46:21 -05:00
3ac57ce7d1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:37:05 -05:00
68fcb3cbef added proxy config to share 2020-12-26 11:20:42 -05:00
4381a2d350 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 11:19:21 -05:00
3cb24f7587 added proxy config to platform 2020-12-26 11:18:58 -05:00
6579a5a0c9 Merge branch 'proxy.base' into acs-base.proxy 2020-12-26 11:16:07 -05:00
d6b7a879b1 added .env configurable platform/share context 2020-12-26 11:15:44 -05:00
1ead7a8d16 added alf-specific variables back to docker-compose env in the right branch 2020-12-26 11:13:00 -05:00
63aa212ccb Merge branch 'proxy.base' into acs-base.proxy 2020-12-26 11:11:48 -05:00
5e618569bc Merge branch 'base' into proxy.base 2020-12-26 11:11:16 -05:00
6d396a640f added JDBC driver to base config 2020-12-26 11:06:07 -05:00
573ab3d2cb Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2020-12-25 23:41:27 -05:00
c2795cd76c Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2020-12-25 23:40:53 -05:00
17f70ea253 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-25 23:40:25 -05:00
2173a9eb5b Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-25 23:40:01 -05:00
8e1a7f11ca Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-25 23:39:36 -05:00
ca1eaa8bff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-25 23:39:19 -05:00
520e211c11 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-25 23:38:58 -05:00
1635445cba Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-25 23:38:36 -05:00
6ec4a797ca Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-25 23:38:22 -05:00
b1f3b14846 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2020-12-25 23:37:08 -05:00
04f44ef280 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-25 23:32:53 -05:00
32ad6d8195 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-25 23:32:25 -05:00
0ed77985f0 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-25 23:32:10 -05:00
4b9900a7fd Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-25 23:30:52 -05:00
56492a45c8 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-25 23:30:25 -05:00
9720bd7fa6 Merge branch 'proxy.base' into acs-base.proxy 2020-12-25 23:08:53 -05:00
4e8453becd removed port from reverse proxy; allows it to work when port changes 2020-12-25 23:08:07 -05:00
ce9b143fb5 added ATS-only base config 2020-12-21 11:50:38 -05:00
ce899a9480 Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2020-12-17 21:03:22 -05:00
701489665a Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community 2020-12-17 21:03:07 -05:00
0976a3975f Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community 2020-12-17 21:02:41 -05:00
22d1220a14 Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2020-12-17 21:02:00 -05:00
0ad2cdf9ad Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community 2020-12-17 21:01:06 -05:00
1d0aa0c91e fixed solr configuration on platform 2020-12-17 21:00:27 -05:00
7a005d16d7 Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community 2020-12-17 20:50:09 -05:00
60b5a8989b changed from v6.2.2-RC1 to v6.2.0-ga 2020-12-17 20:42:54 -05:00
eb11f51348 Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2020-12-17 18:57:36 -05:00
7bb62f421e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-17 18:55:51 -05:00
f02d4ff427 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-17 18:55:28 -05:00
1e09466e78 Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-17 18:54:28 -05:00
b762ba0ce1 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 18:53:59 -05:00
c22af67a06 disabled jodconverter in platform 2020-12-17 18:53:34 -05:00
0b507962fa added sync service config 2020-12-17 17:41:47 -05:00
f73fdbb5ea added volume to base shared file store config 2020-12-17 17:16:01 -05:00
1216469feb Merge branch 'acs-lats-community.acs-community' into acs-search-lats-community.acs-lats-community 2020-12-17 16:48:32 -05:00
6a6dbdc798 set core-aio version 2020-12-17 16:48:13 -05:00
2ac3d013c9 Merge branch 'acs-search-community.acs-community' into acs-search-lats-community.acs-search-community 2020-12-17 16:43:44 -05:00
80a938d674 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-17 16:42:16 -05:00
ddb535ab14 added legacy transform URLs 2020-12-17 16:40:02 -05:00
8be9a0749a Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base 2020-12-17 16:37:05 -05:00
0bd09b8cbd Merge branch 'acs-search-community.acs-community' into acs-share-community.acs-search-community 2020-12-17 16:36:31 -05:00
a7cacf8edc Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 16:35:44 -05:00
43d5686407 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 16:35:11 -05:00
e29e80b650 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-17 16:34:26 -05:00
331eda62fc Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-17 16:33:23 -05:00
fbf7ca3678 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-17 16:32:50 -05:00
ff5442c869 added share to nginx 2020-12-17 16:32:32 -05:00
4cb5100065 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-17 16:31:16 -05:00
f239550be7 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-17 16:29:54 -05:00
3b631bcd87 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-17 16:29:45 -05:00
46bbeeef30 fixed missed envvar 2020-12-17 16:29:36 -05:00
e5824d17e1 added adw to nginx 2020-12-17 16:28:54 -05:00
5cd3530ef0 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-17 16:26:50 -05:00
d6f1c99c79 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-17 16:25:37 -05:00
6b0c103d75 added depends_on for proxy 2020-12-17 16:24:34 -05:00
6d35ffa551 Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base 2020-12-17 16:21:14 -05:00
faee3aaa48 Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy 2020-12-17 16:20:23 -05:00
beb87dd97a Merge branch 'proxy.base' into acs-proxy.proxy 2020-12-17 16:20:12 -05:00
a42af25649 added port for localhost 2020-12-17 16:19:34 -05:00
6c739c5795 Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base 2020-12-17 16:18:18 -05:00
db6a1e148c Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy 2020-12-17 16:16:57 -05:00
ab396f7656 changed version to 'acs' 2020-12-17 16:16:44 -05:00
b65d3d301f Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy 2020-12-17 16:16:07 -05:00
6332985ebd removed proxy 2020-12-17 16:09:48 -05:00
010149e6b6 added platform config 2020-12-17 16:07:17 -05:00
f1df9c3217 initial nginx dynamic docker image config 2020-12-17 16:03:33 -05:00
055119eeb5 added share config 2020-12-17 14:24:15 -05:00
75df5099e9 Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base 2020-12-17 14:20:22 -05:00
69974eaeea Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 13:24:15 -05:00
82d6fd5c8a Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 13:22:28 -05:00
90e935a49e minor fixes 2020-12-17 13:22:05 -05:00
6e32209824 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-17 13:20:59 -05:00
0bb3b7bb28 added service name reference to platform 2020-12-17 13:07:55 -05:00
f97b6b973b Merge branch 'acs-base.base' into acs-lats-base.acs-base 2020-12-17 13:04:06 -05:00
63d1ee7ef9 changed service from solr6 to search; added service name variables 2020-12-17 13:03:32 -05:00
a081d5b5c8 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-17 12:56:03 -05:00
c084972d39 Merge branch 'acs-base.base' into acs-share-base.acs-base 2020-12-17 12:55:48 -05:00
b9fb8971dd Merge branch 'acs-base.base' into acs-adw-base.acs-base 2020-12-17 12:48:57 -05:00
487a677f6f added service referencing variables 2020-12-17 12:48:48 -05:00
0608045c1b Merge branch 'acs-base.base' into acs-ats-base.acs-base 2020-12-17 12:46:35 -05:00
79a1644530 more corrections to service names and addressing additions 2020-12-17 12:46:24 -05:00
8296a96294 Merge branch 'acs-base.base' into acs-adw-base.acs-base 2020-12-17 12:38:18 -05:00
79ef1f5868 added depends_on for ATS 2020-12-17 12:37:10 -05:00
8c480402ed Merge branch 'acs-base.base' into acs-ats-base.acs-base 2020-12-17 12:32:07 -05:00
5cfee3d18f updated service names 2020-12-17 12:31:55 -05:00
8a5004ed74 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-community 2020-12-17 12:29:33 -05:00
3fea801d26 added minimum local transform service 2020-12-17 00:01:13 -05:00
d0a62bfd24 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-16 23:57:29 -05:00
7cedfa4fa2 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-16 23:56:43 -05:00
72f7960369 Merge branch 'acs-base.base' into acs-share-base.acs-base 2020-12-16 23:56:30 -05:00
4f036e530b Merge branch 'acs-base.base' into acs-adw-base.acs-base 2020-12-16 23:56:24 -05:00
6858d201c2 Merge branch 'acs-base.base' into acs-ats-base.acs-base 2020-12-16 23:56:08 -05:00
6c665fab04 added depends_on for the alfresco service 2020-12-16 23:55:56 -05:00
723f3ec954 configured for ACS community v6.2.2-RC1 2020-12-16 23:55:00 -05:00
dcb88c42ea added minimum unconfigured search service 2020-12-16 23:44:46 -05:00
00e0a17249 added share to proxy 2020-12-16 23:42:47 -05:00
89626fcd1d added minimum unconfigured ADW service 2020-12-16 23:42:22 -05:00
bfa65c999e added share unconfigured service 2020-12-16 23:40:20 -05:00
c1323a8171 added ATS minimum unconfigured services 2020-12-16 23:38:34 -05:00
0f36dd1943 added minimum unconfigured ACS services to Docker Compose 2020-12-16 23:34:34 -05:00
8 changed files with 612 additions and 0 deletions

21
.env
View File

@ -0,0 +1,21 @@
ALFRESCO_DIR=~/alfresco
ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost
PROXY_PORT=8080
IDENTITY_SERVICE_PROTOCOL=http
IDENTITY_SERVICE_HOST=auth.example.org
IDENTITY_SERVICE_PORT=8080
ACS_TAG=7.4.1.1
ATR_TAG=3.0.0
ATE_AIO_TAG=4.0.0
ASFS_TAG=3.0.0
AIS_TAG=1.8.0.1
AAMQ_TAG=latest
POSTGRES_TAG=13
ASIE_TAG=2.0.8.2
ACS_SHARE_TAG=7.4.1.2
ALF_SYNC_SERV_TAG=3.9.0
ADW_TAG=4.1.0

View File

@ -3,3 +3,11 @@
This Git Repository intends to represent environments in Docker Compose. All environments are effectively a derivative of other environments. The original environment is the environment represented by the `base` branch. All derivative environments are represented by other branches. Those branches are named in the format `{core}.{parent}`.
## Licensing
This version of Alfresco requires licensing.
### ACS Enterprise
The enterprise version of ACS requires a license file for it to work for more than 2 days. This means it isn't really required, but it is becomes important when you utilize any `persist` branch. For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`. There must be just one file in there that ends in `.lic`.

View File

@ -1,3 +1,219 @@
# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
#
version: "3"
services:
platform:
image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
environment:
JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede
"
JAVA_OPTS: "
-Xms512m -Xmx1g
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dindex.subsystem.name=solr6
-Dsolr.host=search
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=alfresco-secret
-Dshare.host=${PROXY_HOST}
-Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dcsrf.filter.enabled=false
-Dcors.enabled=true
-Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099
-Dlocal.transform.service.enabled=true
-Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
-Djodconverter.url=http://transform-engine-aio:8090
-Dimg.url=http://transform-engine-aio:8090
-Dtika.url=http://transform-engine-aio:8090
-Dtransform.misc.url=http://transform-engine-aio:8090
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
-Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
-Didentity-service.authentication.defaultAdministratorUserNames=admin.1
-Didentity-service.auth-server-url=http://identity:8080/auth
-Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0
-Djodconverter.enabled=false
"
depends_on:
postgres-acs:
condition: service_started
activemq:
condition: service_started
shared-file-store:
condition: service_started
identity:
condition: service_healthy
volumes:
- "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
transform-router:
image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
environment:
ACTIVEMQ_URL: "nio://activemq:61616"
CORE_AIO_URL : "http://transform-core-aio:8090"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
depends_on:
- activemq
- shared-file-store
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
environment:
ACTIVEMQ_URL: "nio://activemq:61616"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
depends_on:
- activemq
- shared-file-store
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-governance-share-enterprise:${ACS_SHARE_TAG}
environment:
REPO_HOST: "platform"
CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
JAVA_OPTS: "
-Dshare.host=${PROXY_HOST}
-Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
-Daims.enabled=true
-Daims.realm=alfresco
-Daims.resource=acs-share
-Daims.authServerUrl=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
-Daims.sslRequired=none
-Daims.publicClient=true
-Daims.autodetectBearerOnly=true
-Daims.alwaysRefreshToken=true
-Daims.principalAttribute=preferred_username
-Daims.enableBasicAuth=true
"
postgres-acs:
image: postgres:${POSTGRES_TAG}
environment:
POSTGRES_PASSWORD: alfresco
POSTGRES_USER: alfresco
POSTGRES_DB: alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
search:
image: alfresco/alfresco-search-services:${ASIE_TAG}
environment:
SOLR_ALFRESCO_HOST: platform
SOLR_SOLR_HOST: search
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
ALFRESCO_SECURE_COMMS: secret
JAVA_TOOL_OPTIONS: "
-Dalfresco.secureComms.secret=alfresco-secret
"
healthcheck:
test: "curl -fsS http://localhost:8983/solr"
activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG}
environment:
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
ACTIVEMQ_ADMIN_LOGIN: alfresco
ACTIVEMQ_ADMIN_PASSWORD: alfresco
sync:
image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
environment:
JAVA_OPTS : "
-Xms64m -Xmx256m
-Dsql.db.driver=org.postgresql.Driver
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dsql.db.username=alfresco
-Dsql.db.password=alfresco
-Dmessaging.broker.host=activemq
-Drepo.hostname=platform
-Drepo.port=8080
-Ddw.server.applicationConnectors[0].type=http
-Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
-Didentity-service.resource=acs-sync
"
depends_on:
- postgres-acs
- activemq
digital-workspace:
image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
environment:
BASE_PATH: ./
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
APP_CONFIG_AUTH_TYPE: OAUTH
APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth/realms/alfresco"
APP_CONFIG_OAUTH2_CLIENTID: alfresco
APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: "/workspace/logout"
identity:
image: alfresco/alfresco-identity-service:${AIS_TAG}
user: jboss
environment:
KEYCLOAK_USER: admin
KEYCLOAK_PASSWORD: admin
KEYCLOAK_FRONTEND_URL: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
KEYCLOAK_STATISTICS: enabled
networks:
default:
aliases:
- "${IDENTITY_SERVICE_HOST}"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/auth/realms/alfresco"]
interval: 10s
timeout: 10s
# Really long startup times on Windows
retries: 18
volumes:
- ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs-sync-share-adw-aims
ports:
- 8080:8080
depends_on:
- platform
- sync
- share
- digital-workspace
- identity
volumes:
shared-file-store-volume:
driver_opts:
type: tmpfs
device: tmpfs

View File

@ -0,0 +1,80 @@
{
"realm": "alfresco",
"enabled": true,
"sslRequired": "external",
"registrationAllowed": false,
"roles": {
"realm": [ {
"name": "user",
"description": "User privileges"
}, {
"name": "admin",
"description": "Administrator privileges"
} ]
},
"clients": [
{
"clientId": "alfresco",
"name": "Alfresco Products",
"enabled": true,
"alwaysDisplayInConsole": false,
"redirectUris": [ "*" ],
"standardFlowEnabled": true,
"implicitFlowEnabled": true,
"directAccessGrantsEnabled": false,
"publicClient": true,
"protocol": "openid-connect",
"attributes": {
"login_theme": "alfresco"
}
},
{
"clientId": "acs-share",
"name": "ACS Share",
"enabled": true,
"alwaysDisplayInConsole": false,
"redirectUris": [ "*" ],
"standardFlowEnabled": true,
"implicitFlowEnabled": false,
"directAccessGrantsEnabled": false,
"publicClient": true,
"protocol": "openid-connect",
"attributes": {
"login_theme": "alfresco"
}
},
{
"clientId": "acs-sync",
"name": "Alfresco Sync Service Clients",
"enabled": true,
"alwaysDisplayInConsole": false,
"redirectUris": [
"http://127.0.0.1*",
"http://localhost*"
],
"standardFlowEnabled": true,
"implicitFlowEnabled": false,
"directAccessGrantsEnabled": false,
"publicClient": true,
"protocol": "openid-connect",
"attributes": {
"login_theme": "alfresco"
}
}
],
"requiredCredentials": [ "password" ],
"users": [
{
"username": "admin",
"email": "admin@app.activiti.com",
"enabled": true,
"credentials" : [
{
"type" : "password",
"value" : "admin"
}
],
"realmRoles": [ "user", "admin" ]
}
]
}

8
nginx-ingress/Dockerfile Normal file
View File

@ -0,0 +1,8 @@
FROM nginx:stable-alpine
COPY nginx.conf /etc/nginx/nginx.conf
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ]

View File

@ -0,0 +1,27 @@
#!/bin/sh
if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACS_SYNC_URL ]]; then
sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACS_SHARE_URL ]]; then
sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ADW_URL ]]; then
sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
fi
if [[ $AIMS_URL ]]; then
sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACCESS_LOG ]]; then
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi
nginx -g "daemon off;"

77
nginx-ingress/nginx.conf Normal file
View File

@ -0,0 +1,77 @@
worker_processes 1;
events {
worker_connections 1024;
}
http {
server {
listen *:8080;
client_max_body_size 0;
set $allowOriginSite *;
proxy_pass_request_headers on;
proxy_pass_header Set-Cookie;
# External settings, do not remove
#ENV_ACCESS_LOG
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
# proxy_buffering off;
proxy_buffer_size 64k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass_header Set-Cookie;
# Protect access to SOLR APIs
location ~ ^(/.*/service/api/solr/.*)$ {return 403;}
location ~ ^(/.*/s/api/solr/.*)$ {return 403;}
location ~ ^(/.*/wcservice/api/solr/.*)$ {return 403;}
location ~ ^(/.*/wcs/api/solr/.*)$ {return 403;}
location ~ ^(/.*/proxy/alfresco/api/solr/.*)$ {return 403 ;}
location ~ ^(/.*/-default-/proxy/alfresco/api/.*)$ {return 403;}
# Protect access to Prometheus endpoint
location ~ ^(/.*/s/prometheus)$ {return 403;}
location / {
proxy_pass http://platform:8080;
}
location /alfresco/ {
proxy_pass http://platform:8080;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
location /sync/ {
proxy_pass http://sync:9090/alfresco/;
}
location /share/ {
proxy_pass http://share:8080;
}
location /workspace/ {
proxy_pass http://digital-workspace:8080/;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
location /auth/ {
proxy_pass http://identity:8080;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
}
}

175
server.xml Normal file
View File

@ -0,0 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
<Server port="8005" shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.startup.VersionLoggerListener" logArgs="false" />
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!-- APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
-->
<GlobalNamingResources>
<!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users
-->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
Documentation at /docs/config/service.html
-->
<Service name="Catalina">
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
<!--
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
-->
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
<Connector port="8080" protocol="HTTP/1.1"
Server=" "
connectionTimeout="20000"
redirectPort="8443"
proxyName="alfresco.inteligr8.com" proxyPort="443" />
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443"
proxyHost="alfresco.inteligr8.com" proxyPort="443" />
-->
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native
library and the useOpenSSL attribute of the AprLifecycleListener.
Either JSSE or OpenSSL style configuration may be used regardless of
the SSLImplementation selected. JSSE style configuration is used below.
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true">
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
</SSLHostConfig>
</Connector>
-->
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
This connector uses the APR/native implementation which always uses
OpenSSL for TLS.
Either JSSE or OpenSSL style configuration may be used. OpenSSL style
configuration is used below.
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150" SSLEnabled="true" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
certificateFile="conf/localhost-rsa-cert.pem"
certificateChainFile="conf/localhost-rsa-chain.pem"
type="RSA" />
</SSLHostConfig>
</Connector>
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<!--
<Connector protocol="AJP/1.3"
address="::1"
port="8009"
redirectPort="8443" />
-->
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host).
Documentation at /docs/config/engine.html -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">
<!--For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
/docs/config/cluster.html (reference documentation) -->
<!--
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->
<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
<Realm className="org.apache.catalina.realm.LockOutRealm">
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
</Realm>
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->
<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t &quot;%r&quot; %s %b" />
<Valve className="org.apache.catalina.valves.RemoteIpValve" />
</Host>
</Engine>
</Service>
</Server>