Skip to content

Commit 862ed11

Browse files
kaanklkykaanklky
committed
All required name changes
1 parent f5b66a5 commit 862ed11

File tree

85 files changed

+218
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+218
-218
lines changed

‎AGPLv3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This is AGPL verbatim license. Countly includes a license schedule
22
next to AGPL in LICENSE.md file (modified section 7). For more
3-
information about licensing Community Edition, see LICENSE.md
3+
information about licensing Countly Lite, see LICENSE.md
44
file, and also read Licensing FAQ here:
55

66
http://resources.count.ly/docs/licencing-faq

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Countly is a big project benefiting from plugin support to make contributions ea
1212

1313
## Contribution areas
1414

15-
You can always send a pull request to Countly Community Edition or to Countly SDKs for the following:
15+
You can always send a pull request to Countly Lite or to Countly SDKs for the following:
1616

1717
* New features, small or big, including installation, integration, tests, user interface, user experience, extra platforms and such.
1818
* Bugfixes (excluding translations, explained below)

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM phusion/baseimage:focal-1.2.0
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
4-
# Enterprise Edition:
4+
# Countly Enterprise:
55
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
66

77
ARG COUNTLY_CONFIG_API_MONGODB_HOST=localhost

‎Dockerfile-api

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM node:hydrogen-bullseye-slim
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
4-
# Enterprise Edition:
4+
# Countly Enterprise:
55
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
66

77
ARG GEOIP=empty

‎Dockerfile-centos-api

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM centos:8
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
4-
# Enterprise Edition:
4+
# Countly Enterprise:
55
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
66

77
ARG GEOIP=empty

‎Dockerfile-centos-frontend

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM centos:8
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
4-
# Enterprise Edition:
4+
# Countly Enterprise:
55
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
66

77
EXPOSE 6001

‎Dockerfile-core

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM phusion/baseimage:focal-1.2.0
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
4-
# Enterprise Edition:
4+
# Countly Enterprise:
55
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
66

77
ARG COUNTLY_CONFIG_API_MONGODB_HOST=localhost

‎Dockerfile-frontend

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM node:hydrogen-bullseye-slim
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
4-
# Enterprise Edition:
4+
# Countly Enterprise:
55
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
66

77
EXPOSE 6001

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Countly Product Analytics - Community Edition License
1+
Countly Product Analytics - Countly Lite
22
--------------------------------------------------
33

44
© Countly, https://count.ly

‎bin/commands/countly.sh

+13-13
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ countly_upgrade (){
202202
if [ "$VERSION" == "$NEW_VERSION" ]; then
203203
cp -Rf "$DIR/../../"plugins/plugins.default.json "$DIR/../../"plugins/plugins.ce.json
204204

205-
echo "Extracting Countly Enterprise Edition..."
205+
echo "Extracting Countly Enterprise..."
206206
(cd "$DIR/../../../";
207207
tar -zxf "${FILE}";)
208208

@@ -217,12 +217,12 @@ countly_upgrade (){
217217
echo "Upgrading Countly..."
218218
countly upgrade
219219
else
220-
echo "Version mismatch detected! Version of Countly Community Edition should be the same with Enterprise Edition. Please upgrade Countly to Community Edition v${NEW_VERSION} first."
221-
echo "Community Edition v${VERSION}"
222-
echo "Enterprise Edition v${NEW_VERSION}"
220+
echo "Version mismatch detected! Version of Countly Lite should be the same with Countly Enterprise. Please upgrade Countly to Countly Lite v${NEW_VERSION} first."
221+
echo "Countly Lite v${VERSION}"
222+
echo "Countly Enterprise v${NEW_VERSION}"
223223
fi
224224
else
225-
echo "Error: Couldn't find any Enterprise Edition package, you should place archive file into '$(cd "$DIR/../../../"; pwd;)'"
225+
echo "Error: Couldn't find any Countly Enterprise package, you should place archive file into '$(cd "$DIR/../../../"; pwd;)'"
226226
fi
227227
elif [ "$1" == "ce" ]
228228
then
@@ -233,7 +233,7 @@ countly_upgrade (){
233233
NEW_VERSION="$(grep -oP 'version:\s*"\K[0-9\.]*' "/tmp/countly/frontend/express/version.info.js")"
234234
rm -rf /tmp/countly
235235

236-
echo -e "\e[91m\n\n !!! WARNING !!! \n\nYou are going to downgrade from Enterprise Edition to Community Edition;\nthis will disable all Enterprise Edition plugins, delete all Enterprise\nEdition plugins and also will drop 'countly_drill' database since it contains\ndata for Enterprise Edition features.\e[0m"
236+
echo -e "\e[91m\n\n !!! WARNING !!! \n\nYou are going to downgrade from Countly Enterprise to Countly Lite;\nthis will disable all Countly Enterprise plugins, delete all Enterprise\nEdition plugins and also will drop 'countly_drill' database since it contains\ndata for Countly Enterprise features.\e[0m"
237237
read -r -p "Are you sure you want to continue? [y/N] " response
238238
if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]
239239
then
@@ -244,7 +244,7 @@ countly_upgrade (){
244244
if [ "$VERSION" == "$NEW_VERSION" ]; then
245245
cp -Rf "$DIR/../../"plugins/plugins.json "$DIR/../../"plugins/plugins.ee.json
246246

247-
echo "Extracting Countly Community Edition..."
247+
echo "Extracting Countly Lite..."
248248
(cd "$DIR/../../../";
249249
tar -zxf "${FILE}";)
250250
bash "$DIR/../scripts/detect.init.sh"
@@ -268,14 +268,14 @@ countly_upgrade (){
268268
echo "Upgrading Countly..."
269269
countly upgrade
270270
else
271-
echo "Version mismatch detected! Version of Enterprise Community Edition should be the same with Community Edition. Please upgrade Countly to Enterprise Edition v${NEW_VERSION} first."
272-
echo "Enterprise Edition v${VERSION}"
273-
echo "Community Edition v${NEW_VERSION}"
271+
echo "Version mismatch detected! Version of Countly Enterprise should be the same with Countly Lite. Please upgrade Countly to Countly Enterprise v${NEW_VERSION} first."
272+
echo "Countly Enterprise v${VERSION}"
273+
echo "Countly Lite v${NEW_VERSION}"
274274
echo -e "\nYou can run the command below & 'countly upgrade ce' again if you think core of Countly v${VERSION} is compatible to work with v${NEW_VERSION}.\nsed -i 's/version: \"${VERSION}\"/version: \"${NEW_VERSION}\"/g' $(countly dir)/frontend/express/version.info.js\n"
275275
fi
276276
fi
277277
else
278-
echo "Error: Couldn't find any Community Edition package, you should place archive file into '$(cd "$DIR/../../../"; pwd;)'"
278+
echo "Error: Couldn't find any Countly Lite package, you should place archive file into '$(cd "$DIR/../../../"; pwd;)'"
279279
fi
280280
elif [ "$1" == "help" ]
281281
then
@@ -292,8 +292,8 @@ countly_upgrade (){
292292
echo " countly upgrade version <from> <to> [-y] # run all upgrade scripts between provided versions";
293293
echo " countly upgrade version fs <from> <to> [-y] # run all filesystem upgrade scripts between provided versions";
294294
echo " countly upgrade version db <from> <to> [-y] # run all database upgrade scripts between provided versions";
295-
echo " countly upgrade ee # upgrade from Community Edition to Enterprise Edition within the same version";
296-
echo " countly upgrade ce # upgrade from Enterprise Edition to Community Edition within the same version";
295+
echo " countly upgrade ee # upgrade from Countly Lite to Countly Enterprise within the same version";
296+
echo " countly upgrade ce # upgrade from Countly Enterprise to Countly Lite within the same version";
297297
echo " countly upgrade help # this command";
298298
fi
299299
}

‎bin/docker/k8s/countly-api.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
containers:
4040
- name: countly-api
4141
image: countly/api:23.03
42-
# image: gcr.io/countly-01/api:23.03 # Enterprise Edition
42+
# image: gcr.io/countly-01/api:23.03 # Countly Enterprise
4343
imagePullPolicy: Always
4444
ports:
4545
- containerPort: 3001
@@ -53,7 +53,7 @@ spec:
5353
env:
5454
- name: COUNTLY_PLUGINS
5555
value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
56-
# Enterprise Edition: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
56+
# Countly Enterprise: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
5757
- name: COUNTLY_CONFIG_API_FILESTORAGE
5858
value: "gridfs"
5959
- name: COUNTLY_CONFIG__MONGODB

‎bin/docker/k8s/countly-frontend.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
containers:
4040
- name: countly-frontend
4141
image: countly/frontend:23.03
42-
# image: gcr.io/countly-01/frontend:23.03 # Enterprise Edition
42+
# image: gcr.io/countly-01/frontend:23.03 # Countly Enterprise
4343
imagePullPolicy: Always
4444
ports:
4545
- containerPort: 6001
@@ -53,7 +53,7 @@ spec:
5353
env:
5454
- name: COUNTLY_PLUGINS
5555
value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
56-
# Enterprise Edition: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
56+
# Countly Enterprise: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
5757
- name: COUNTLY_CONFIG_API_FILESTORAGE
5858
value: "gridfs"
5959
- name: COUNTLY_CONFIG__MONGODB

‎bin/docker/k8s/ingestion/countly-ingestion.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
containers:
2929
- name: countly-ingestion
3030
image: countly/api:23.03
31-
# image: gcr.io/countly-01/api:23.03 # Enterprise Edition
31+
# image: gcr.io/countly-01/api:23.03 # Countly Enterprise
3232
imagePullPolicy: Always
3333
ports:
3434
- containerPort: 3001
@@ -42,7 +42,7 @@ spec:
4242
env:
4343
- name: COUNTLY_PLUGINS
4444
value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
45-
# Enterprise Edition: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
45+
# Countly Enterprise: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
4646
- name: COUNTLY_CONFIG_API_FILESTORAGE
4747
value: "gridfs"
4848
- name: COUNTLY_CONFIG__MONGODB

‎bin/upgrade/15.03/readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ Files to modify:
4444
4545
/var/countly/frontend/express/config.sample.js
4646
47-
#and if you have enterprise edition then also
47+
#and if you have Countly Enterprise then also
4848
/var/countly/plugins/drill/config.sample.js
4949
```
5050

5151
5) Additionally you might need to copy app image files from your old countly frontend/express/public/appimages/ folder
5252

53-
6) If you are upgrading from Countly Community Edition also execute community upgrade script
53+
6) If you are upgrading from Countly Lite also execute community upgrade script
5454

5555
bash bin/upgrade/15.03/community.upgrade.sh

0 commit comments

Comments
 (0)