Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

pull/387/head
Kevin Fitzpatrick 2016-11-07 09:07:55 -08:00
parent 788e23c311 16d6d7a7e3
commit 134df35db2
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/build.py
View File

@ -23,12 +23,14 @@ LOG_DIR = "/var/log/chronograf"
DATA_DIR = "/var/lib/chronograf" DATA_DIR = "/var/lib/chronograf"
SCRIPT_DIR = "/usr/lib/chronograf/scripts" SCRIPT_DIR = "/usr/lib/chronograf/scripts"
LOGROTATE_DIR = "/etc/logrotate.d" LOGROTATE_DIR = "/etc/logrotate.d"
CANNED_DIR = "/usr/share/chronograf/canned"
INIT_SCRIPT = "etc/scripts/init.sh" INIT_SCRIPT = "etc/scripts/init.sh"
SYSTEMD_SCRIPT = "etc/scripts/chronograf.service" SYSTEMD_SCRIPT = "etc/scripts/chronograf.service"
POSTINST_SCRIPT = "etc/scripts/post-install.sh" POSTINST_SCRIPT = "etc/scripts/post-install.sh"
POSTUNINST_SCRIPT = "etc/scripts/post-uninstall.sh" POSTUNINST_SCRIPT = "etc/scripts/post-uninstall.sh"
LOGROTATE_SCRIPT = "etc/scripts/logrotate" LOGROTATE_SCRIPT = "etc/scripts/logrotate"
CANNED_SCRIPTS = "canned/*json"
# Default AWS S3 bucket for uploads # Default AWS S3 bucket for uploads
DEFAULT_BUCKET = "dl.influxdata.com/chronograf/artifacts" DEFAULT_BUCKET = "dl.influxdata.com/chronograf/artifacts"
@ -112,7 +114,8 @@ def create_package_fs(build_root):
LOG_DIR[1:], LOG_DIR[1:],
DATA_DIR[1:], DATA_DIR[1:],
SCRIPT_DIR[1:], SCRIPT_DIR[1:],
LOGROTATE_DIR[1:] LOGROTATE_DIR[1:],
CANNED_DIR[1:]
] ]
for d in dirs: for d in dirs:
os.makedirs(os.path.join(build_root, d)) os.makedirs(os.path.join(build_root, d))
@ -135,6 +138,10 @@ def package_scripts(build_root, config_only=False, windows=False):
logging.debug("Moving {} to {}".format(script, dest)) logging.debug("Moving {} to {}".format(script, dest))
shutil.copyfile(script, dest) shutil.copyfile(script, dest)
os.chmod(dest, 0o644) os.chmod(dest, 0o644)
run("cp {} {} && chmod 644 {}".format(CANNED_SCRIPTS,
os.path.join(build_root, CANNED_DIR[1:]),
os.path.join(build_root, CANNED_DIR[1:], "*json")),
shell=True)
def run_generate(): def run_generate():
"""Generate static assets. """Generate static assets.

2
etc/scripts/chronograf.service
View File

@ -8,7 +8,7 @@ After=network-online.target
[Service] [Service]
User=chronograf User=chronograf
Group=chronograf Group=chronograf
ExecStart=/usr/bin/chronograf --host localhost --port 10000 -b /var/lib/chronograf/chronograf.db -c /usr/share/chronograf ExecStart=/usr/bin/chronograf --host localhost --port 10000 -b /var/lib/chronograf/chronograf.db -c /usr/share/chronograf/canned
KillMode=control-group KillMode=control-group
Restart=on-failure Restart=on-failure

2
etc/scripts/init.sh
View File

@ -13,7 +13,7 @@
# Script to execute when starting # Script to execute when starting
SCRIPT="/usr/bin/chronograf" SCRIPT="/usr/bin/chronograf"
# Options to pass to the script on startup # Options to pass to the script on startup
SCRIPT_OPTS="--host localhost --port 10000 -b /var/lib/chronograf/chronograf.db -c /usr/share/chronograf" SCRIPT_OPTS="--host localhost --port 10000 -b /var/lib/chronograf/chronograf.db -c /usr/share/chronograf/canned"
# User to run the process under # User to run the process under
RUNAS=chronograf RUNAS=chronograf