Skip to content

GitLab

G
genieacs
Commit 7e40b73e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Reverted back to use config.json

parent 5828c460
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 26 deletions
Makefile
View file @ 7e40b73e
...@@ -14,6 +14,7 @@ all: acs-cwmp-service acs-fs-service acs-nbi-service acs-ui-service genieacs-con ...@@ -14,6 +14,7 @@ all: acs-cwmp-service acs-fs-service acs-nbi-service acs-ui-service genieacs-con
@echo "$$GENIEACS_LOGROTATE" > /etc/logrotate.d/genieacs @echo "$$GENIEACS_LOGROTATE" > /etc/logrotate.d/genieacs
install -v -Dm755 genieacs /usr/share/easycwmp/functions install -v -Dm755 genieacs /usr/share/easycwmp/functions
install -v -Dm755 genieacs-init /usr/sbin/genieacs-init install -v -Dm755 genieacs-init /usr/sbin/genieacs-init
ln -s /run/genieacs/config.json /srv/genieacs/config/config.json
@echo "d /run/genieacs 0755 root root -" > /usr/lib/tmpfiles.d/genieacs.conf @echo "d /run/genieacs 0755 root root -" > /usr/lib/tmpfiles.d/genieacs.conf
...@@ -36,8 +37,7 @@ Description=GenieACS CWMP ...@@ -36,8 +37,7 @@ Description=GenieACS CWMP
[Service] [Service]
Environment="NODE_PATH=/srv/genieacs/node_modules" Environment="NODE_PATH=/srv/genieacs/node_modules"
ConditionFileNotEmpty=/run/genieacs/config.env ConditionFileNotEmpty=/run/genieacs/config.json
EnvironmentFile=/run/genieacs/config.env
Restart=always Restart=always
ExecStartPre=/usr/sbin/genieacs-init ExecStartPre=/usr/sbin/genieacs-init
ExecStart=/srv/genieacs/bin/genieacs-cwmp ExecStart=/srv/genieacs/bin/genieacs-cwmp
...@@ -54,8 +54,7 @@ Description=GenieACS file system ...@@ -54,8 +54,7 @@ Description=GenieACS file system
[Service] [Service]
Environment="NODE_PATH=/srv/genieacs/node_modules" Environment="NODE_PATH=/srv/genieacs/node_modules"
ConditionFileNotEmpty=/run/genieacs/config.env ConditionFileNotEmpty=/run/genieacs/config.json
EnvironmentFile=/run/genieacs/config.env
Restart=always Restart=always
ExecStartPre=/usr/sbin/genieacs-init ExecStartPre=/usr/sbin/genieacs-init
ExecStart=/srv/genieacs/bin/genieacs-fs ExecStart=/srv/genieacs/bin/genieacs-fs
...@@ -72,8 +71,7 @@ Description=GenieACS north bound interface ...@@ -72,8 +71,7 @@ Description=GenieACS north bound interface
[Service] [Service]
Environment="NODE_PATH=/srv/genieacs/node_modules" Environment="NODE_PATH=/srv/genieacs/node_modules"
ConditionFileNotEmpty=/run/genieacs/config.env ConditionFileNotEmpty=/run/genieacs/config.json
EnvironmentFile=/run/genieacs/config.env
Restart=always Restart=always
ExecStartPre=/usr/sbin/genieacs-init ExecStartPre=/usr/sbin/genieacs-init
ExecStart=/srv/genieacs/bin/genieacs-nbi ExecStart=/srv/genieacs/bin/genieacs-nbi
...@@ -90,8 +88,7 @@ Description=GenieACS user interface ...@@ -90,8 +88,7 @@ Description=GenieACS user interface
[Service] [Service]
Environment="NODE_PATH=/srv/genieacs/node_modules" Environment="NODE_PATH=/srv/genieacs/node_modules"
ConditionFileNotEmpty=/run/genieacs/config.env ConditionFileNotEmpty=/run/genieacs/config.json
EnvironmentFile=/run/genieacs/config.env
Restart=always Restart=always
ExecStartPre=/usr/sbin/genieacs-init ExecStartPre=/usr/sbin/genieacs-init
ExecStart=/srv/genieacs/bin/genieacs-ui ExecStart=/srv/genieacs/bin/genieacs-ui
......
genieacs-init
View file @ 7e40b73e
...@@ -9,24 +9,26 @@ FS=`$UCI_GET genieacs.settings.fs_interface` ...@@ -9,24 +9,26 @@ FS=`$UCI_GET genieacs.settings.fs_interface`
UI=`$UCI_GET genieacs.settings.ui_interface` UI=`$UCI_GET genieacs.settings.ui_interface`
SECRET=`$UCI_GET genieacs.settings.secret` SECRET=`$UCI_GET genieacs.settings.secret`
if [ ! -z $MONGODB ] && [ ! -z $NBI ] && [ ! -z $FS ] ; then if [ ! -z $MONGODB ] && [ ! -z $NBI ] && [ ! -z $FS ] ; then
cat << EOF > /run/genieacs/config.env cat << EOF > /run/genieacs/config.json
MONGODB_CONNECTION_URL=$MONGODB {
EXT_DIR=/srv/genieacs/ext "MONGODB_CONNECTION_URL": "$MONGODB",
EXT_TIMEOUT=3000 "EXT_DIR": "/srv/genieacs/ext",
CWMP_INTERFACE=$CWMP "EXT_TIMEOUT": "3000",
CWMP_PORT=7547 "CWMP_INTERFACE": "$CWMP",
CWMP_ACCESS_LOG_FILE=/var/log/genieacs/genieacs-cwmp-access.log "CWMP_PORT": "7547",
NBI_INTERFACE=$NBI "CWMP_ACCESS_LOG_FILE": "/var/log/genieacs/genieacs-cwmp-access.log",
NBI_PORT=7557 "NBI_INTERFACE": "$NBI",
NBI_ACCESS_LOG_FILE=/var/log/genieacs/genieacs-nbi-access.log "NBI_PORT": "7557",
FS_INTERFACE=$FS "NBI_ACCESS_LOG_FILE": "/var/log/genieacs/genieacs-nbi-access.log",
FS_PORT=7567 "FS_INTERFACE": "$FS",
FS_ACCESS_LOG_FILE=/var/log/genieacs/genieacs-fs-access.log "FS_PORT": "7567",
UI_INTERFACE=$UI "FS_ACCESS_LOG_FILE": "/var/log/genieacs/genieacs-fs-access.log",
UI_PORT=80 "UI_INTERFACE": "$UI",
UI_JWT_SECRET=$SECRET "UI_PORT": "80",
ACS_UI_ACCESS_LOG_FILE=/var/log/genieacs/genieacs-ui-access.log "UI_JWT_SECRET": "$SECRET",
DEBUG_FILE=/var/log/genieacs/genieacs-debug.yaml "ACS_UI_ACCESS_LOG_FILE": "/var/log/genieacs/genieacs-ui-access.log",
"DEBUG_FILE": "/var/log/genieacs/genieacs-debug.yaml"
}
EOF EOF
else else
rm -f /run/genieacs/config.json rm -f /run/genieacs/config.json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment