mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'origin/4.15'
This commit is contained in:
commit
f98940953b
@ -28,6 +28,12 @@ Set up Maven (3.6.0):
|
|||||||
# echo export PATH=/usr/local/maven/bin:${PATH} >> ~/.bashrc # or .zshrc or .profile
|
# echo export PATH=/usr/local/maven/bin:${PATH} >> ~/.bashrc # or .zshrc or .profile
|
||||||
# source ~/.bashrc
|
# source ~/.bashrc
|
||||||
|
|
||||||
|
Setup up NodeJS (LTS):
|
||||||
|
|
||||||
|
# curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash -
|
||||||
|
# sudo yum install nodejs
|
||||||
|
# sudo npm install -g @vue/cli npm-check-updates
|
||||||
|
|
||||||
Start the MySQL service:
|
Start the MySQL service:
|
||||||
|
|
||||||
$ service mysqld start
|
$ service mysqld start
|
||||||
|
|||||||
@ -607,7 +607,8 @@
|
|||||||
</copy>
|
</copy>
|
||||||
<copy todir="${project.build.directory}/classes/META-INF/webapp">
|
<copy todir="${project.build.directory}/classes/META-INF/webapp">
|
||||||
<fileset dir="${basedir}/../ui">
|
<fileset dir="${basedir}/../ui">
|
||||||
<exclude name=".*"/>
|
<include name="index.html"/>
|
||||||
|
<include name="legacy/**"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
<copy overwrite="true" todir="${basedir}/target/utilities/bin">
|
<copy overwrite="true" todir="${basedir}/target/utilities/bin">
|
||||||
|
|||||||
1
debian/cloudstack-management.install
vendored
1
debian/cloudstack-management.install
vendored
@ -21,6 +21,7 @@
|
|||||||
/etc/cloudstack/management/server.properties
|
/etc/cloudstack/management/server.properties
|
||||||
/etc/cloudstack/management/java.security.ciphers
|
/etc/cloudstack/management/java.security.ciphers
|
||||||
/etc/cloudstack/management/log4j-cloud.xml
|
/etc/cloudstack/management/log4j-cloud.xml
|
||||||
|
/etc/cloudstack/management/config.json
|
||||||
/etc/default/cloudstack-management
|
/etc/default/cloudstack-management
|
||||||
/etc/security/limits.d/cloudstack-limits.conf
|
/etc/security/limits.d/cloudstack-limits.conf
|
||||||
/etc/sudoers.d/cloudstack
|
/etc/sudoers.d/cloudstack
|
||||||
|
|||||||
19
debian/cloudstack-ui.install
vendored
Normal file
19
debian/cloudstack-ui.install
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
|
/etc/cloudstack/ui/config.json
|
||||||
|
/usr/share/cloudstack-ui/*
|
||||||
7
debian/control
vendored
7
debian/control
vendored
@ -3,7 +3,7 @@ Section: libs
|
|||||||
Priority: extra
|
Priority: extra
|
||||||
Maintainer: Wido den Hollander <wido@widodh.nl>
|
Maintainer: Wido den Hollander <wido@widodh.nl>
|
||||||
Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
|
Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
|
||||||
python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), python3 (>= 3), lsb-release, dh-systemd, python-setuptools
|
python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), python3 (>= 3), nodejs (>= 12), lsb-release, dh-systemd, python-setuptools
|
||||||
Standards-Version: 3.8.1
|
Standards-Version: 3.8.1
|
||||||
Homepage: http://www.cloudstack.org/
|
Homepage: http://www.cloudstack.org/
|
||||||
|
|
||||||
@ -37,6 +37,11 @@ Description: CloudStack usage monitor
|
|||||||
The CloudStack usage monitor provides usage accounting across the entire cloud for
|
The CloudStack usage monitor provides usage accounting across the entire cloud for
|
||||||
cloud operators to charge based on usage parameters.
|
cloud operators to charge based on usage parameters.
|
||||||
|
|
||||||
|
Package: cloudstack-ui
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Description: The CloudStack UI
|
||||||
|
|
||||||
Package: cloudstack-docs
|
Package: cloudstack-docs
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
|
|||||||
14
debian/rules
vendored
14
debian/rules
vendored
@ -93,6 +93,20 @@ override_dh_auto_install:
|
|||||||
install -m0644 packaging/systemd/$(PACKAGE)-management.service debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service
|
install -m0644 packaging/systemd/$(PACKAGE)-management.service debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service
|
||||||
install -m0644 packaging/systemd/$(PACKAGE)-management.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-management
|
install -m0644 packaging/systemd/$(PACKAGE)-management.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-management
|
||||||
|
|
||||||
|
# cloudstack-ui
|
||||||
|
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/ui
|
||||||
|
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-ui
|
||||||
|
cd ui && npm install && npm run build && cd ..
|
||||||
|
cp -r ui/dist/config.json $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/ui/
|
||||||
|
cp -r ui/dist/* $(DESTDIR)/usr/share/$(PACKAGE)-ui/
|
||||||
|
rm -f $(DESTDIR)/usr/share/$(PACKAGE)-ui/config.json
|
||||||
|
ln -s /$(SYSCONFDIR)/$(PACKAGE)/ui/config.json $(DESTDIR)/usr/share/$(PACKAGE)-ui/config.json
|
||||||
|
# copy ui to cloudstack-management
|
||||||
|
cp -r ui/dist/config.json $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
|
||||||
|
cp -r ui/dist/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp/
|
||||||
|
rm -f $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp/config.json
|
||||||
|
ln -s /$(SYSCONFDIR)/$(PACKAGE)/management/config.json $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp/config.json
|
||||||
|
|
||||||
# cloudstack-common
|
# cloudstack-common
|
||||||
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common
|
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common
|
||||||
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
|
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
|
||||||
|
|||||||
@ -49,6 +49,7 @@ BuildRequires: mysql-connector-python
|
|||||||
BuildRequires: maven => 3.0.0
|
BuildRequires: maven => 3.0.0
|
||||||
BuildRequires: python-setuptools
|
BuildRequires: python-setuptools
|
||||||
BuildRequires: wget
|
BuildRequires: wget
|
||||||
|
BuildRequires: nodejs
|
||||||
|
|
||||||
%description
|
%description
|
||||||
CloudStack is a highly-scalable elastic, open source,
|
CloudStack is a highly-scalable elastic, open source,
|
||||||
@ -137,6 +138,12 @@ Group: System Environment/Libraries
|
|||||||
%description usage
|
%description usage
|
||||||
The CloudStack usage calculation service
|
The CloudStack usage calculation service
|
||||||
|
|
||||||
|
%package ui
|
||||||
|
Summary: CloudStack UI
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
%description ui
|
||||||
|
The CloudStack UI
|
||||||
|
|
||||||
%package cli
|
%package cli
|
||||||
Summary: Apache CloudStack CLI
|
Summary: Apache CloudStack CLI
|
||||||
Provides: python-marvin
|
Provides: python-marvin
|
||||||
@ -195,6 +202,7 @@ if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
mvn -Psystemvm,developer $FLAGS clean package
|
mvn -Psystemvm,developer $FLAGS clean package
|
||||||
|
cd ui && npm install && npm run build && cd ..
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
||||||
@ -255,6 +263,10 @@ cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-
|
|||||||
|
|
||||||
cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
|
cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
|
||||||
cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
|
cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
|
||||||
|
cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/
|
||||||
|
cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/
|
||||||
|
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/config.json
|
||||||
|
ln -sf /etc/%{name}/management/config.json ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/config.json
|
||||||
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack-%{_maventag}.jar
|
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack-%{_maventag}.jar
|
||||||
cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
|
cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
|
||||||
|
|
||||||
@ -280,6 +292,14 @@ install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}
|
|||||||
touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
|
touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
|
||||||
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
|
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
|
||||||
|
|
||||||
|
# UI
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
|
||||||
|
cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui/
|
||||||
|
cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
|
||||||
|
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
|
||||||
|
ln -sf /etc/%{name}/ui/config.json ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
|
||||||
|
|
||||||
# Package mysql-connector-python
|
# Package mysql-connector-python
|
||||||
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/ee/ff/48bde5c0f013094d729fe4b0316ba2a24774b3ff1c52d924a8a4cb04078a/six-1.15.0-py2.py3-none-any.whl
|
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/ee/ff/48bde5c0f013094d729fe4b0316ba2a24774b3ff1c52d924a8a4cb04078a/six-1.15.0-py2.py3-none-any.whl
|
||||||
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/e9/93/4860cebd5ad3ff2664ad3c966490ccb46e3b88458b2095145bca11727ca4/setuptools-47.3.1-py3-none-any.whl
|
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/e9/93/4860cebd5ad3ff2664ad3c966490ccb46e3b88458b2095145bca11727ca4/setuptools-47.3.1-py3-none-any.whl
|
||||||
@ -355,6 +375,8 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent
|
|||||||
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
|
||||||
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
|
||||||
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
|
||||||
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
|
||||||
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
|
||||||
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
|
||||||
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
|
||||||
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
|
||||||
@ -498,6 +520,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
|
|||||||
%config(noreplace) %{_sysconfdir}/security/limits.d/cloud
|
%config(noreplace) %{_sysconfdir}/security/limits.d/cloud
|
||||||
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
|
||||||
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
|
||||||
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/config.json
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
|
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
|
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
|
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
|
||||||
@ -560,6 +583,12 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
|
|||||||
%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
|
%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
|
||||||
%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
|
%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
|
||||||
|
|
||||||
|
%files ui
|
||||||
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/ui/config.json
|
||||||
|
%attr(0644,root,root) %{_datadir}/%{name}-ui/*
|
||||||
|
%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
|
||||||
|
%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
|
||||||
|
|
||||||
%files usage
|
%files usage
|
||||||
%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
|
%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
|
||||||
%config(noreplace) %{_sysconfdir}/default/%{name}-usage
|
%config(noreplace) %{_sysconfdir}/default/%{name}-usage
|
||||||
|
|||||||
@ -48,6 +48,7 @@ BuildRequires: /usr/bin/mkisofs
|
|||||||
BuildRequires: maven => 3.0.0
|
BuildRequires: maven => 3.0.0
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
BuildRequires: wget
|
BuildRequires: wget
|
||||||
|
BuildRequires: nodejs
|
||||||
|
|
||||||
%description
|
%description
|
||||||
CloudStack is a highly-scalable elastic, open source,
|
CloudStack is a highly-scalable elastic, open source,
|
||||||
@ -132,6 +133,12 @@ Group: System Environment/Libraries
|
|||||||
%description usage
|
%description usage
|
||||||
The CloudStack usage calculation service
|
The CloudStack usage calculation service
|
||||||
|
|
||||||
|
%package ui
|
||||||
|
Summary: CloudStack UI
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
%description ui
|
||||||
|
The CloudStack UI
|
||||||
|
|
||||||
%package cli
|
%package cli
|
||||||
Summary: Apache CloudStack CLI
|
Summary: Apache CloudStack CLI
|
||||||
Provides: python-marvin
|
Provides: python-marvin
|
||||||
@ -192,6 +199,7 @@ if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
mvn -Psystemvm,developer $FLAGS clean package
|
mvn -Psystemvm,developer $FLAGS clean package
|
||||||
|
cd ui && npm install && npm run build && cd ..
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
||||||
@ -252,6 +260,10 @@ cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-
|
|||||||
|
|
||||||
cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
|
cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
|
||||||
cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
|
cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
|
||||||
|
cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/
|
||||||
|
cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/
|
||||||
|
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/config.json
|
||||||
|
ln -sf /etc/%{name}/management/config.json ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp/config.json
|
||||||
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack-%{_maventag}.jar
|
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack-%{_maventag}.jar
|
||||||
cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
|
cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
|
||||||
|
|
||||||
@ -277,6 +289,14 @@ install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}
|
|||||||
touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
|
touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
|
||||||
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
|
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
|
||||||
|
|
||||||
|
# UI
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
|
||||||
|
cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui/
|
||||||
|
cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
|
||||||
|
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
|
||||||
|
ln -sf /etc/%{name}/ui/config.json ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
|
||||||
|
|
||||||
# Package mysql-connector-python
|
# Package mysql-connector-python
|
||||||
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/ee/ff/48bde5c0f013094d729fe4b0316ba2a24774b3ff1c52d924a8a4cb04078a/six-1.15.0-py2.py3-none-any.whl
|
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/ee/ff/48bde5c0f013094d729fe4b0316ba2a24774b3ff1c52d924a8a4cb04078a/six-1.15.0-py2.py3-none-any.whl
|
||||||
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/e9/93/4860cebd5ad3ff2664ad3c966490ccb46e3b88458b2095145bca11727ca4/setuptools-47.3.1-py3-none-any.whl
|
wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/e9/93/4860cebd5ad3ff2664ad3c966490ccb46e3b88458b2095145bca11727ca4/setuptools-47.3.1-py3-none-any.whl
|
||||||
@ -352,6 +372,8 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent
|
|||||||
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
|
||||||
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
|
||||||
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
|
||||||
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
|
||||||
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
|
||||||
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
|
||||||
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
|
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
|
||||||
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
|
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
|
||||||
@ -495,6 +517,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
|
|||||||
%config(noreplace) %{_sysconfdir}/security/limits.d/cloud
|
%config(noreplace) %{_sysconfdir}/security/limits.d/cloud
|
||||||
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
|
||||||
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
|
||||||
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/config.json
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
|
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
|
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
|
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
|
||||||
@ -557,6 +580,12 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
|
|||||||
%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
|
%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
|
||||||
%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
|
%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
|
||||||
|
|
||||||
|
%files ui
|
||||||
|
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/ui/config.json
|
||||||
|
%attr(0644,root,root) %{_datadir}/%{name}-ui/*
|
||||||
|
%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
|
||||||
|
%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
|
||||||
|
|
||||||
%files usage
|
%files usage
|
||||||
%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
|
%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
|
||||||
%config(noreplace) %{_sysconfdir}/default/%{name}-usage
|
%config(noreplace) %{_sysconfdir}/default/%{name}-usage
|
||||||
|
|||||||
56
pom.xml
56
pom.xml
@ -81,23 +81,23 @@
|
|||||||
<cs.logging.version>1.1.1</cs.logging.version>
|
<cs.logging.version>1.1.1</cs.logging.version>
|
||||||
|
|
||||||
<!-- Apache Commons versions -->
|
<!-- Apache Commons versions -->
|
||||||
<cs.codec.version>1.14</cs.codec.version>
|
<cs.codec.version>1.15</cs.codec.version>
|
||||||
<cs.commons-collections.version>4.4</cs.commons-collections.version>
|
<cs.commons-collections.version>4.4</cs.commons-collections.version>
|
||||||
<cs.commons-compress.version>1.19</cs.commons-compress.version>
|
<cs.commons-compress.version>1.20</cs.commons-compress.version>
|
||||||
<cs.commons-exec.version>1.3</cs.commons-exec.version>
|
<cs.commons-exec.version>1.3</cs.commons-exec.version>
|
||||||
<cs.commons-fileupload.version>1.4</cs.commons-fileupload.version>
|
<cs.commons-fileupload.version>1.4</cs.commons-fileupload.version>
|
||||||
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
|
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
|
||||||
<cs.commons-io.version>2.6</cs.commons-io.version>
|
<cs.commons-io.version>2.8.0</cs.commons-io.version>
|
||||||
<cs.commons-lang3.version>3.9</cs.commons-lang3.version>
|
<cs.commons-lang3.version>3.11</cs.commons-lang3.version>
|
||||||
<cs.commons-logging.version>1.2</cs.commons-logging.version>
|
<cs.commons-logging.version>1.2</cs.commons-logging.version>
|
||||||
<cs.commons-net.version>3.6</cs.commons-net.version>
|
<cs.commons-net.version>3.7.2</cs.commons-net.version>
|
||||||
<cs.commons-validator.version>1.6</cs.commons-validator.version>
|
<cs.commons-validator.version>1.6</cs.commons-validator.version>
|
||||||
<cs.configuration.version>1.10</cs.configuration.version>
|
<cs.configuration.version>1.10</cs.configuration.version>
|
||||||
<cs.daemon.version>1.2.2</cs.daemon.version>
|
<cs.daemon.version>1.2.3</cs.daemon.version>
|
||||||
<cs.dbcp.version>2.7.0</cs.dbcp.version>
|
<cs.dbcp.version>2.8.0</cs.dbcp.version>
|
||||||
<cs.discovery.version>0.5</cs.discovery.version>
|
<cs.discovery.version>0.5</cs.discovery.version>
|
||||||
<cs.lang.version>2.6</cs.lang.version>
|
<cs.lang.version>2.6</cs.lang.version>
|
||||||
<cs.pool.version>2.7.0</cs.pool.version>
|
<cs.pool.version>2.9.0</cs.pool.version>
|
||||||
<cs.commons-math3.version>3.6.1</cs.commons-math3.version>
|
<cs.commons-math3.version>3.6.1</cs.commons-math3.version>
|
||||||
|
|
||||||
<!-- Testing versions -->
|
<!-- Testing versions -->
|
||||||
@ -116,45 +116,45 @@
|
|||||||
<cs.xercesImpl.version>2.12.0</cs.xercesImpl.version>
|
<cs.xercesImpl.version>2.12.0</cs.xercesImpl.version>
|
||||||
|
|
||||||
<!-- Dependencies versions -->
|
<!-- Dependencies versions -->
|
||||||
<cs.amqp-client.version>5.8.0</cs.amqp-client.version>
|
<cs.amqp-client.version>5.10.0</cs.amqp-client.version>
|
||||||
<cs.apache-cloudstack-java-client.version>1.0.9</cs.apache-cloudstack-java-client.version>
|
<cs.apache-cloudstack-java-client.version>1.0.9</cs.apache-cloudstack-java-client.version>
|
||||||
<cs.aspectjrt.version>1.9.5</cs.aspectjrt.version>
|
<cs.aspectjrt.version>1.9.6</cs.aspectjrt.version>
|
||||||
<cs.aws.sdk.version>1.11.717</cs.aws.sdk.version>
|
<cs.aws.sdk.version>1.11.940</cs.aws.sdk.version>
|
||||||
<cs.axiom.version>1.2.8</cs.axiom.version>
|
<cs.axiom.version>1.2.8</cs.axiom.version>
|
||||||
<cs.axis.version>1.4</cs.axis.version>
|
<cs.axis.version>1.4</cs.axis.version>
|
||||||
<cs.batik.version>1.12</cs.batik.version>
|
<cs.batik.version>1.14</cs.batik.version>
|
||||||
<cs.bcprov.version>1.64</cs.bcprov.version>
|
<cs.bcprov.version>1.64</cs.bcprov.version>
|
||||||
<cs.cglib.version>3.3.0</cs.cglib.version>
|
<cs.cglib.version>3.3.0</cs.cglib.version>
|
||||||
<cs.checkstyle-lib.version>8.18</cs.checkstyle-lib.version>
|
<cs.checkstyle-lib.version>8.18</cs.checkstyle-lib.version>
|
||||||
<cs.cxf.version>3.2.6</cs.cxf.version>
|
<cs.cxf.version>3.2.14</cs.cxf.version>
|
||||||
<cs.ehcache.version>2.6.11</cs.ehcache.version>
|
<cs.ehcache.version>2.6.11</cs.ehcache.version>
|
||||||
<cs.globodns-client.version>0.0.27</cs.globodns-client.version>
|
<cs.globodns-client.version>0.0.27</cs.globodns-client.version>
|
||||||
<cs.google-http-client>1.34.2</cs.google-http-client>
|
<cs.google-http-client>1.38.1</cs.google-http-client>
|
||||||
<cs.groovy.version>2.4.17</cs.groovy.version>
|
<cs.groovy.version>2.4.17</cs.groovy.version>
|
||||||
<cs.gson.version>1.7.2</cs.gson.version>
|
<cs.gson.version>1.7.2</cs.gson.version>
|
||||||
<cs.guava.version>28.2-jre</cs.guava.version>
|
<cs.guava.version>30.1-jre</cs.guava.version>
|
||||||
<cs.httpclient.version>4.5.11</cs.httpclient.version>
|
<cs.httpclient.version>4.5.13</cs.httpclient.version>
|
||||||
<cs.httpcore.version>4.4.13</cs.httpcore.version>
|
<cs.httpcore.version>4.4.14</cs.httpcore.version>
|
||||||
<cs.influxdb-java.version>2.20</cs.influxdb-java.version>
|
<cs.influxdb-java.version>2.21</cs.influxdb-java.version>
|
||||||
<cs.jackson.version>2.10.3</cs.jackson.version>
|
<cs.jackson.version>2.12.1</cs.jackson.version>
|
||||||
<cs.jasypt.version>1.9.3</cs.jasypt.version>
|
<cs.jasypt.version>1.9.3</cs.jasypt.version>
|
||||||
<cs.java-ipv6.version>0.17</cs.java-ipv6.version>
|
<cs.java-ipv6.version>0.17</cs.java-ipv6.version>
|
||||||
<cs.javassist.version>3.26.0-GA</cs.javassist.version>
|
<cs.javassist.version>3.27.0-GA</cs.javassist.version>
|
||||||
<cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
|
<cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
|
||||||
<cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
|
<cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
|
||||||
<cs.jaxb.version>2.3.0</cs.jaxb.version>
|
<cs.jaxb.version>2.3.0</cs.jaxb.version>
|
||||||
<cs.jaxws.version>2.3.2-1</cs.jaxws.version>
|
<cs.jaxws.version>2.3.2-1</cs.jaxws.version>
|
||||||
<cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
|
<cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
|
||||||
<cs.jetty.version>9.4.27.v20200227</cs.jetty.version>
|
<cs.jetty.version>9.4.36.v20210114</cs.jetty.version>
|
||||||
<cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
|
<cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
|
||||||
<cs.jna.version>5.5.0</cs.jna.version>
|
<cs.jna.version>5.5.0</cs.jna.version>
|
||||||
<cs.joda-time.version>2.10.5</cs.joda-time.version>
|
<cs.joda-time.version>2.10.9</cs.joda-time.version>
|
||||||
<cs.jpa.version>2.2.1</cs.jpa.version>
|
<cs.jpa.version>2.2.1</cs.jpa.version>
|
||||||
<cs.jsch.version>0.1.55</cs.jsch.version>
|
<cs.jsch.version>0.1.55</cs.jsch.version>
|
||||||
<cs.json.version>20090211</cs.json.version>
|
<cs.json.version>20090211</cs.json.version>
|
||||||
<cs.jstl.version>1.2</cs.jstl.version>
|
<cs.jstl.version>1.2</cs.jstl.version>
|
||||||
<cs.kafka-clients.version>0.11.0.3</cs.kafka-clients.version>
|
<cs.kafka-clients.version>2.7.0</cs.kafka-clients.version>
|
||||||
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
|
<cs.libvirt-java.version>0.5.2</cs.libvirt-java.version>
|
||||||
<cs.mail.version>1.5.0-b01</cs.mail.version>
|
<cs.mail.version>1.5.0-b01</cs.mail.version>
|
||||||
<cs.mysql.version>8.0.19</cs.mysql.version>
|
<cs.mysql.version>8.0.19</cs.mysql.version>
|
||||||
<cs.neethi.version>2.0.4</cs.neethi.version>
|
<cs.neethi.version>2.0.4</cs.neethi.version>
|
||||||
@ -162,16 +162,16 @@
|
|||||||
<cs.opensaml.version>2.6.4</cs.opensaml.version>
|
<cs.opensaml.version>2.6.4</cs.opensaml.version>
|
||||||
<cs.rados-java.version>0.6.0</cs.rados-java.version>
|
<cs.rados-java.version>0.6.0</cs.rados-java.version>
|
||||||
<cs.reflections.version>0.9.12</cs.reflections.version>
|
<cs.reflections.version>0.9.12</cs.reflections.version>
|
||||||
<cs.servicemix.version>3.3.3_1</cs.servicemix.version>
|
<cs.servicemix.version>3.4.4_1</cs.servicemix.version>
|
||||||
<cs.servlet.version>4.0.1</cs.servlet.version>
|
<cs.servlet.version>4.0.1</cs.servlet.version>
|
||||||
<cs.tomcat-embed-core.version>8.5.47</cs.tomcat-embed-core.version>
|
<cs.tomcat-embed-core.version>8.5.61</cs.tomcat-embed-core.version>
|
||||||
<cs.trilead.version>1.0.0-build222</cs.trilead.version>
|
<cs.trilead.version>1.0.0-build222</cs.trilead.version>
|
||||||
<cs.vmware.api.version>6.7</cs.vmware.api.version>
|
<cs.vmware.api.version>6.7</cs.vmware.api.version>
|
||||||
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
|
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
|
||||||
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
|
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
|
||||||
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
|
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
|
||||||
<cs.xstream.version>1.4.11.1</cs.xstream.version>
|
<cs.xstream.version>1.4.15</cs.xstream.version>
|
||||||
<org.springframework.version>5.2.3.RELEASE</org.springframework.version>
|
<org.springframework.version>5.3.3</org.springframework.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
|||||||
@ -86,6 +86,12 @@ sudo apt-get -q -y -V install freeipmi-common libfreeipmi16 libgcrypt20 libgpg-e
|
|||||||
echo -e "\nIPMI version"
|
echo -e "\nIPMI version"
|
||||||
ipmitool -V
|
ipmitool -V
|
||||||
|
|
||||||
|
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
|
||||||
|
sudo apt-get install -y nodejs
|
||||||
|
|
||||||
|
echo -e "\nNode version"
|
||||||
|
npm version
|
||||||
|
|
||||||
echo "<settings>
|
echo "<settings>
|
||||||
<mirrors>
|
<mirrors>
|
||||||
<mirror>
|
<mirror>
|
||||||
|
|||||||
0
ui/error.html → ui/public/error.html
vendored
0
ui/error.html → ui/public/error.html
vendored
Loading…
x
Reference in New Issue
Block a user