From 51631b84b44be276962f6bb5358aced8fe1ab1ec Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 9 Jul 2015 10:59:45 -0400 Subject: [PATCH] cleanup generated files --- .../CMakeDirectoryInformation.cmake | 16 --------- web/api/CMakeFiles/progress.marks | 1 - web/api/app/Config/core.php | 4 +-- web/api/app/Plugin/Crud | 2 +- web/api/cmake_install.cmake | 34 ------------------- 5 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 web/api/CMakeFiles/CMakeDirectoryInformation.cmake delete mode 100644 web/api/CMakeFiles/progress.marks delete mode 100644 web/api/cmake_install.cmake diff --git a/web/api/CMakeFiles/CMakeDirectoryInformation.cmake b/web/api/CMakeFiles/CMakeDirectoryInformation.cmake deleted file mode 100644 index 3d1e4eadd..000000000 --- a/web/api/CMakeFiles/CMakeDirectoryInformation.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -# Relative path conversion top directories. -SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/ubuntu/zm/ZoneMinder") -SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/ubuntu/zm/ZoneMinder") - -# Force unix paths in dependencies. -SET(CMAKE_FORCE_UNIX_PATHS 1) - - -# The C and CXX include file regular expressions for this directory. -SET(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$") -SET(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$") -SET(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN}) -SET(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN}) diff --git a/web/api/CMakeFiles/progress.marks b/web/api/CMakeFiles/progress.marks deleted file mode 100644 index 573541ac9..000000000 --- a/web/api/CMakeFiles/progress.marks +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php index 1e1b11bc7..436cf8d60 100644 --- a/web/api/app/Config/core.php +++ b/web/api/app/Config/core.php @@ -222,12 +222,12 @@ /** * A random string used in security hashing methods. */ - Configure::write('Security.salt', 'y8s4nPwjdjrmAGRxtnbxWhOknOBX6y1etr6RD8XM'); + Configure::write('Security.salt', 'Q0MjGG2xRQEhJVQR85WhFJKI7f2St8RYMlVR7GNQ'); /** * A random numeric string (digits only) used to encrypt/decrypt strings. */ - Configure::write('Security.cipherSeed', '28284715058574819699789789248'); + Configure::write('Security.cipherSeed', '02670120062639232092038865362'); /** * Apply timestamps with the last modified time to static assets (js, css, images). diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud index c3976f147..f1cf70fff 160000 --- a/web/api/app/Plugin/Crud +++ b/web/api/app/Plugin/Crud @@ -1 +1 @@ -Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5 +Subproject commit f1cf70ffff0657db29388eca94e6c5ea4944a164 diff --git a/web/api/cmake_install.cmake b/web/api/cmake_install.cmake deleted file mode 100644 index 677eb9b9f..000000000 --- a/web/api/cmake_install.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Install script for directory: /home/ubuntu/zm/ZoneMinder/web/api - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -# Install shared libraries without execute permission? -IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - SET(CMAKE_INSTALL_SO_NO_EXE "1") -ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) -