From 48b2fd9ac0a2d4c58231d1899c4b11742afc5a92 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Jul 06 2023 21:32:15 +0000 Subject: Merge branch 'drop-misc' into 'production' Remove various decomissioned machines See merge request infra/salt!659 --- diff --git a/pillar/cluster/anna_elsa/backends.sls b/pillar/cluster/anna_elsa/backends.sls index 26cd71f..8b1b16c 100644 --- a/pillar/cluster/anna_elsa/backends.sls +++ b/pillar/cluster/anna_elsa/backends.sls @@ -228,9 +228,6 @@ haproxy: chat: {{ options() }} {{ server('matrix', '192.168.47.78') }} - fedora-sso: - {{ options('httpchk OPTIONS / HTTP/1.1\r\nHOST:\ sso.opensuse.org') }} - {{ server('fedora-sso', '192.168.47.81') }} wip: mode: http extra: errorfile 503 {{ errorfiles }}fourohfour.html.http diff --git a/pillar/cluster/anna_elsa/services_http_ext.sls b/pillar/cluster/anna_elsa/services_http_ext.sls index 207ef2b..ebe9316 100644 --- a/pillar/cluster/anna_elsa/services_http_ext.sls +++ b/pillar/cluster/anna_elsa/services_http_ext.sls @@ -19,7 +19,6 @@ haproxy: - path_openid path_beg -i /common/app/ - path_openid path_beg -i /openid-ldap - path_openid path_beg -i /idp - - path_openidlegacy path_beg -i /openidlegacy - path_searchpage path_beg -i /searchPage - path_slash path / - path_favicon path /favicon.ico @@ -113,8 +112,6 @@ haproxy: - is_board hdr(host) -i board.opensuse.org - is_redirect_itsself hdr(host) -i redirector.opensuse.org - is_rpmlint hdr(host) -i rpmlint.opensuse.org - - is_sso hdr(host) -i sso.opensuse.org - - is_sso hdr_reg(host) -i .+\.sso\.opensuse\.org - is_susestudio hdr_reg(host) -i (.*\.)?susestudio.com - is_svn hdr(host) -i svn.opensuse.org - is_redirect_git hdr(host) -i git.opensuse.org @@ -137,7 +134,6 @@ haproxy: - code 301 location https://static.opensuse.org/favicon.ico code 302 if path_favicon is_www - code 301 location https://static.opensuse.org/favicon.ico code 302 if path_favicon is_mailman3 - code 301 location https://search.opensuse.org if is_www path_searchpage - - code 301 location https://sso.opensuse.org/openidlegacy if is_www path_openidlegacy - code 301 prefix https://www.opensuse.org if is_mainpage !path_kubic_registry - code 301 prefix https://events.opensuse.org if is_redirect_events - code 301 location https://www.youtube.com/user/opensusetv if is_tube @@ -180,7 +176,6 @@ haproxy: - conncheck if is_conncheck - deadservices if is_features || is_deadservice - etherpad if is_etherpad - - fedora-sso if is_sso - forums if is_forums - freeipa if is_freeipa - gccstats if is_gcc diff --git a/pillar/id/fedora-accounts_infra_opensuse_org.sls b/pillar/id/fedora-accounts_infra_opensuse_org.sls deleted file mode 100644 index e553596..0000000 --- a/pillar/id/fedora-accounts_infra_opensuse_org.sls +++ /dev/null @@ -1,17 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: [] - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Testing machine for the new IDP system. - documentation: [] - responsible: - - hellcp - - Pharaoh_Atem - partners: [] - weburls: [] -roles: [] diff --git a/pillar/id/fedora-freeipa_infra_opensuse_org.sls b/pillar/id/fedora-freeipa_infra_opensuse_org.sls deleted file mode 100644 index fb16e48..0000000 --- a/pillar/id/fedora-freeipa_infra_opensuse_org.sls +++ /dev/null @@ -1,17 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: [] - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Testing machine for the new FreeIPA system. - documentation: [] - responsible: - - hellcp - - Pharaoh_Atem - partners: [] - weburls: [] -roles: [] diff --git a/pillar/id/fedora-sso_infra_opensuse_org.sls b/pillar/id/fedora-sso_infra_opensuse_org.sls deleted file mode 100644 index f7a6808..0000000 --- a/pillar/id/fedora-sso_infra_opensuse_org.sls +++ /dev/null @@ -1,17 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: [] - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Testing machine for the new SingleSingOn system. - documentation: [] - responsible: - - hellcp - - Pharaoh_Atem - partners: [] - weburls: [] -roles: [] diff --git a/pillar/id/identification_infra_opensuse_org.sls b/pillar/id/identification_infra_opensuse_org.sls deleted file mode 100644 index ba2b5b2..0000000 --- a/pillar/id/identification_infra_opensuse_org.sls +++ /dev/null @@ -1,16 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - freeIPA - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - aliases: [] - documentation: - - https://www.freeipa.org/page/Documentation - responsible: - - hellcp - partners: [] - weburls: [] -roles: [] diff --git a/pillar/id/kruemel_infra_opensuse_org.sls b/pillar/id/kruemel_infra_opensuse_org.sls deleted file mode 100644 index fe99152..0000000 --- a/pillar/id/kruemel_infra_opensuse_org.sls +++ /dev/null @@ -1,16 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - unused? see poo#64595 - reboot_safe: unknown - salt_cluster: opensuse - virt_cluster: atreju - - aliases: - - planet.infra.opensuse.org - description: probably unused VM, see poo#64595 (previously PlanetPlanet RSS feed aggregator) - documentation: [] - responsible: [] - partners: [] - weburls: [] diff --git a/pillar/id/new-forum_infra_opensuse_org.sls b/pillar/id/new-forum_infra_opensuse_org.sls deleted file mode 100644 index 3b9c728..0000000 --- a/pillar/id/new-forum_infra_opensuse_org.sls +++ /dev/null @@ -1,21 +0,0 @@ -grains: - city: nuremberg - country: de - hostusage: - - vBulletin - reboot_safe: yes - salt_cluster: opensuse - virt_cluster: atreju - - aliases: [] - description: Webserver running forums.opensuse.org on vBulletin - documentation: - - https://www.vbulletin.com/en/manual - responsible: - - oreinert - - pjessen - partners: [] - weburls: - - https://forums.opensuse.org -roles: - - web_forum diff --git a/pillar/role/web_forum.sls b/pillar/role/web_forum.sls deleted file mode 100644 index f734b47..0000000 --- a/pillar/role/web_forum.sls +++ /dev/null @@ -1,98 +0,0 @@ -include: - - role.common.nginx - {% if salt['grains.get']('include_secrets', True) %} - - secrets.role.web_forum - {% endif %} - -{% set vhost = 'forums' %} -nginx: - ng: - servers: - managed: - {{vhost}}.conf: - config: - - server: - - listen: 80 - - server_name: forums.opensuse.org - - root: /srv/www/vhosts/{{vhost}}/htdocs - - index: index.php index.html - - access_log: /var/log/nginx/{{vhost}}.access.log combined - - error_log: /var/log/nginx/{{vhost}}.error.log - - location = /50x.html: - - root: /srv/www/htdocs - - location = /css\.php: - - rewrite: ^ /core/css.php break - - location ^~ /install: - - rewrite: ^/install/ /core/install/ break - - location /: - - if (!-f $request_filename): - - rewrite: ^/(.*)$ /index.php?routestring=$1 last - - location ^~ /admincp: - - if (!-f $request_filename): - - rewrite: ^/admincp/?(.*)$ /index.php?routestring=admincp/$1 last - - location ~ \.php$: - - if (!-f $request_filename): - - rewrite: ^/(.*)$ /index.php?routestring=$1 break - - fastcgi_split_path_info: ^(.+\.php)(.*)$ - - fastcgi_pass: phpfastcgi - - fastcgi_index: index.php - - fastcgi_param: SCRIPT_FILENAME $document_root$fastcgi_script_name - - include: fastcgi_params - - fastcgi_param: QUERY_STRING $query_string - - fastcgi_param: REQUEST_METHOD $request_method - - fastcgi_param: CONTENT_TYPE $content_type - - fastcgi_param: CONTENT_LENGTH $content_length - - fastcgi_intercept_errors: 'on' - - fastcgi_ignore_client_abort: 'off' - - fastcgi_connect_timeout: 60 - - fastcgi_send_timeout: 180 - - fastcgi_read_timeout: 180 - - fastcgi_buffers: 256 16k - - fastcgi_buffer_size: 32k - - fastcgi_temp_file_write_size: 256k - - upstream phpfastcgi: - - server: unix:/run/php-fpm/{{vhost}}.sock - enabled: True - -# configure host-specific parameters for vbulletin in pillar/id/*.sls -vbulletin: - config: - Database: - dbname: webforums2 - technicalemail: admin-auto@opensuse.org - tableprefix: vb_ - MasterServer: - servername: 192.168.47.4 - port: 3307 - username: vbulletin - # password provided as a secret - Mysqli: - charset: Latin1 - SpecialUsers: - canviewadminlog: '1,5' - canpruneadminlog: '1,5' - canrunqueries: '1,5' - undeletableusers: '1' - superadmins: '1,431,740,783,5442,105475' - Misc: - maxwidth: 2592 - maxheight: 1944 - -zypper: - packages: - php7-fpm: {} - php7-mysql: {} - php7-gd: {} - php7-json: {} - php7-xmlreader: {} - php7-xmlwriter: {} - php7-mbstring: {} - php7-iconv: {} - php7-imagick: {} - php7-curl: {} - php7-ctype: {} - php7-phar: {} - php7-opcache: {} - php7-tokenizer: {} - php7-zlib: {} - diff --git a/pillar/secrets/role/mysql_tmp.sls b/pillar/secrets/role/mysql_tmp.sls deleted file mode 100644 index 26cd174..0000000 --- a/pillar/secrets/role/mysql_tmp.sls +++ /dev/null @@ -1,185 +0,0 @@ -#!yaml|gpg - -mysql: - server: - root_password: | - -----BEGIN PGP MESSAGE----- - - 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 - =ErfA - -----END PGP MESSAGE----- - - user: - forums: - password: | - -----BEGIN PGP MESSAGE----- - - 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 - =k9CU - -----END PGP MESSAGE----- diff --git a/salt/profile/vbulletin/README.md b/salt/profile/vbulletin/README.md deleted file mode 100644 index 03c1da8..0000000 --- a/salt/profile/vbulletin/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# vBulletin 5 Setup for openSUSE Forums - -Brief setup instructions: - - 1. Prepare the binaries as instructed in [init.sls](init.sls). - 1. ``salt-call state.apply grains`` - 1. ``salt-call state.apply pillar='{"vbulletin":{"tools":"yes"}}'`` - 1. ``cd /srv/www/vhosts/forums/`` - 1. ``(cd htdocs/core/install; sudo -u nginx php -f upgrade.php)`` - 1. `` mysql webforums - - - - - vBulletin Test Script - - - - - - - - -
cplogovBulletin Server Test Script
vBulletin Website
 
-
-
- -options(MYSQLI_OPT_LOCAL_INFILE, false); - - if (mysqli_connect_errno()) - { - $db_connection_error = mysqli_connect_error(); - return false; - } - return $obj; - } -} - -function test_ini_set($setting, $value) -{ - $result = @ini_set($setting, $value); - if ($result === false OR $result === null) - { - return false; - } - else - { - return $result; - } -} - -//initalise variables dont want any XSS in our test script :) -$versions = array(); - -$required_versions = array( - 'PHP' => '7.2.0', - 'MySQL' => '5.5.8' -); - -if (!empty($_GET['help'])) -{ - $tested = false; - - $type = strtolower($_GET['help']); - $help = array(); - $help['php'] = 'Your PHP Version is too low to support vBulletin 5, you must at least upgrade to ' . $required_versions['PHP']; - $help['mysql'] = 'Your MySQL version is too low to support vBulletin 5, you must at least upgrade to ' . $required_versions['MySQL']; - $help['pcre'] = 'vBulletin requires PCRE to be enabled in PHP, ask your host to enable this in php.ini'; - $help['open_basedir'] = 'You may experience problems with uploading files to vBulletin'; - $help['curl'] = 'The cUrl extension is needed for many features that gather data from the internet'; - $help['json'] = 'The JSON extension is required to support vBulletin 5'; - $help['gzip'] = 'vBulletin uses GZIP to compress pages, though this is not essential for operation'; - $help['mysql_perms'] = 'vBulletin requires that the mysql username has create, select, update, insert, ' . - 'delete, alter and drop privledges, contact your host and ask them to adjust these privledges.'; - $help['xml'] = 'XML is required as a major component of vBulletin for data storage of languages, settings and templates.'; - $help['gd'] = 'GD functions are used to produce images, this includes features such as thumbnails and image verification on registration'; - $help['iconv'] = 'Iconv is used to handle different character encodings. Either the Multibyte String ' . - 'or iconv modules are required to properly handle character encodings. Multibyte String is preferred.'; - $help['mbstring'] = 'Multibyte String is used to handle different character encodings. Either the Multibyte String ' . - 'or iconv modules are required to properly handle character encodings. Multibyte String is preferred.'; - $help['pcre.backtrack_limit'] = 'PHP 5.2.0 and above imposes a limit on PCRE code that we are unable to work-around on this server. ' . - 'Ask your host to add the following to php.ini:
pcre.backtrack_limit = -1'; - $help['pcre.utf8'] = 'PCRE with utf8 support is recommended'; - $help['mysql.utf8mb4'] = 'The utf8mb4 character set allows extended (up to four byte) utf8 characters. Requires MySql 5.5.3 or greater.'; - - echo ''; - echo ''; -} -elseif (empty($_POST['server']) or empty($_POST['user']) or empty($_POST['db'])) -{ - $tested = false; - - echo ''; - echo ''; - echo ''; - echo ' '; - echo ' '; - echo ''; - echo ''; - echo ' '; - echo ' '; - echo ''; - echo ''; - echo ' '; - echo ' '; - echo ''; - echo ''; - echo ' '; - echo ' '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; -} -else -{ - $tested = true; - - /** - * Define the tests - */ - - // modules - // modulename => 'represtative function' or array('function1', 'function2'). There should also be a "help" - // entry for every module - $required_modules = array( - 'PCRE' => 'preg_replace', - 'XML' => 'xml_set_element_handler', - 'curl' => 'curl_init', - 'json' => 'json_encode' - ); - - $recommended_modules = array( - 'GZIP' => array('crc32', 'gzcompress'), - 'GD' => 'imagecreatetruecolor', - 'iconv' => 'iconv', - 'mbstring' => 'mb_convert_encoding' - ); - - //'feature' => test query. Will check if query produces an error, but not - //what it returns - $mysql_perms = array( - 'create' => 'CREATE TABLE vb3_test (test int(10) unsigned NOT NULL)', - 'alter' => 'ALTER TABLE vb3_test CHANGE test test VARCHAR(254) NOT NULL', - 'insert' => 'INSERT INTO vb3_test (test) VALUES (\'abcd\')', - 'update' => 'UPDATE vb3_test SET test=123 WHERE test=\'abcd\'', - 'select' => 'SELECT * FROM vb3_test WHERE test=123', - 'delete' => 'DELETE FROM vb3_test WHERE test=123', - 'drop' => 'DROP TABLE vb3_test' - ); - - //either a query string (check for error) or an anonymous function that - //takes the mysqli object as a parameter. Always fails when the db connection - //does not exist (function will not be called). - $mysql_recommended = array( - 'mysql.utf8mb4' => function($db) - { - $result = $db->query("SHOW CHARACTER SET LIKE 'utf8mb4'"); - return ($result->num_rows > 0); - }, - ); - - $required_tests = array(); - - $recommended_tests = array( - 'open_basedir' => function() - { - return (get_cfg_var('open_basedir') == ''); - }, - 'pcre.backtrack_limit' => function() - { - return (!test_ini_set('pcre.backtrack_limit', -1) === false); - }, - 'pcre.utf8support' => function() - { - return (@preg_match('/\p{L}/u', 'a') == 1); - }, - ); - - - /** - * Run the tests - */ - - class vB_TestObserver - { - private $results = array(); - private $failures = 0; - - public function getFailureCount() - { - return $this->failures; - } - - public function getResults() - { - return $this->results; - } - - public function logTest($name, $result) - { - $this->results[$name] = (bool) $result; - if(!$result) - { - $this->failures++; - } - } - } - - $requiredResults = new vB_TestObserver(); - $recommendedResults = new vB_TestObserver(); - $mysqlResults = new vB_TestObserver(); - - //PHP - $versions['PHP'] = phpversion(); - - $db = DB::fetch_db($_POST['server'], $_POST['user'], $_POST['pass'], $_POST['db']); - //MySQL - if(!$db) - { - //if we don't this this, then then it will be set by the version test. - $requiredResults->logTest('MySQL', false); - } - else - { - $vquery = $db->query('SELECT VERSION() AS version'); - $mysql = $vquery->fetch_array(); - $versions['MySQL'] = $mysql['version']; - } - - //check mysql permissions - foreach($mysql_perms AS $feature => $query) - { - $mysqlResults->logTest($feature, ($db AND $db->query($query))); - } - - foreach($mysql_recommended AS $feature => $query) - { - if(!$db) - { - $result = false; - } - else if (is_callable($query)) - { - $result = $query($db); - } - else - { - $result = (bool) $db->query($query); - } - - $recommendedResults->logTest($feature, $result); - } - - - if ($db) - { - $db->close(); - } - - //check versions -- if we don't set the version of something, we skip the check - //(presumably this means we couldn't look it up and there is another error that covers - //that such as the database. - foreach($versions as $feature => $version) - { - $requiredResults->logTest($feature, !version_compare($version, $required_versions[$feature], '<')); - } - - function check_modules($modules, $observer) - { - //check modules. - foreach ($modules AS $module => $function) - { - $test_function = $function; - if (!is_array($function)) - { - $test_function = array($test_function); - } - - $pass = true; - foreach($test_function AS $check) - { - if (!function_exists($check)) - { - $pass = false; - } - } - - $observer->logTest($module, $pass); - } - } - - check_modules($required_modules, $requiredResults); - check_modules($recommended_modules, $recommendedResults); - - foreach($required_tests AS $name => $function) - { - $requiredResults->logTest($name, $function()); - } - - foreach($recommended_tests AS $name => $function) - { - $recommendedResults->logTest($name, $function()); - } - - //translate to the previos vars for display -- should eventually rewrite that - //part as well. - $e_test = $requiredResults->getResults(); - $mysql = $mysqlResults->getResults(); - $test = $recommendedResults->getResults(); - - //a bit of a hack to handle previous behavior. This doesn't - //fit into our nice little formal setup. - //not sure why we set the version only if GD passes. - if ($test['GD']) - { - $versions['GD'] = '2.x'; - } - - $e_error = $requiredResults->getFailureCount() + $mysqlResults->getFailureCount(); - $error = $recommendedResults->getFailureCount(); - - echo ''; - foreach ($e_test AS $type => $result) { - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ''; - } - if ($db_connection_error) - { - echo ''; - echo ' '; - echo ''; - } - echo ''; - foreach ($mysql AS $type => $result) { - echo ''; - echo ' '; - echo ' '; - echo ''; - } - - echo ''; - foreach ($test AS $type => $result) { - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ''; - } - - echo ''; - -} - -?> -
' . htmlspecialchars($type) . ' Help
' . $help["$type"] . '
MySQL Information
MySQL Server
MySQL Database
MySQL Username
MySQL Password
Essential vBulletin Requirements
' . $type . '' . (!isset($versions["$type"]) ? '' : $versions["$type"]) . '' . iif($result, 'Pass', 'Fail') . '
Database Connection Error:  ' . htmlspecialchars($db_connection_error) . '
MySQL Permission Requirements
' . $type . '' . iif($result, 'Pass', 'Fail') . '
Recommended Settings (Optional)
' . $type . '' . (!isset($versions["$type"]) ? '' : $versions["$type"]) . '' . iif($result, 'Pass', 'Fail') . '
Overall Result:' . iif($e_error, 'Fail', 'Pass') . '
-
-vBulletin 5 should run on your system without any errors

'; - } - elseif ($e_error == 0) - { - echo '

vBulletin 5 should run on your system though there may be reduced functionality, click the link(s) above for more information

'; - } - else - { - echo '

vBulletin5 will not run on your system, please click the link(s) above for more information.

'; - } - } -/*======================================================================*\ -|| #################################################################### -|| # CVS: $RCSfile$ - $Revision: 105451 $ -|| #################################################################### -\*======================================================================*/ -?> - - diff --git a/salt/profile/vbulletin/init.sls b/salt/profile/vbulletin/init.sls deleted file mode 100644 index 350b17f..0000000 --- a/salt/profile/vbulletin/init.sls +++ /dev/null @@ -1,13 +0,0 @@ -# NOTE: -# The vb5 binaries must be uploaded to the target host, and made available at -# -# /root/vb5_connect.zip -# -# before running state.apply - -include: - - profile.vbulletin.php-fpm -{% if salt['file.file_exists']('/root/vb5_connect.zip') %} - - profile.vbulletin.setup - - profile.vbulletin.tools -{% endif %} diff --git a/salt/profile/vbulletin/php-fpm.sls b/salt/profile/vbulletin/php-fpm.sls deleted file mode 100644 index b856755..0000000 --- a/salt/profile/vbulletin/php-fpm.sls +++ /dev/null @@ -1,34 +0,0 @@ -/etc/php7/fpm/php.ini: - file.managed: - - contents: - - memory_limit = 192M - - opcache.enable=1 - - opcache.interned_strings_buffer=8 - - opcache.max_accelerated_files=10000 - - opcache.memory_consumption=128 - - opcache.save_comments=1 - - opcache.revalidate_freq=1 - -/etc/php7/fpm/php-fpm.conf: - file.managed: - - contents: - - pid = run/php-fpm.pid - - error_log = syslog - - syslog.ident = fpm - - log_level = notice - - include=/etc/php7/fpm/php-fpm.d/*.conf - -/etc/php7/fpm/php-fpm.d/forums.conf: - file.managed: - - source: salt://profile/vbulletin/files/fpm-listener.conf - - template: jinja - - context: - name: forums - user: nginx - -php-fpm: - service.running: - - enable: True - - watch: - - file: /etc/php7/fpm/* - diff --git a/salt/profile/vbulletin/setup.sls b/salt/profile/vbulletin/setup.sls deleted file mode 100644 index 954f22a..0000000 --- a/salt/profile/vbulletin/setup.sls +++ /dev/null @@ -1,61 +0,0 @@ -/srv/www/vhosts/forums: - file.directory: - - user: root - - group: nginx - - dir_mode: 750 - - makedirs: True - archive.extracted: - - source: /root/vb5_connect.zip - - keep_source: False - - enforce_toplevel: False - - trim_output: True - -/srv/www/vhosts/forums/htdocs: - file.copy: - - source: /srv/www/vhosts/forums/upload - - preserve: True - - user: root - - group: nginx - - mode: 644 - -/srv/www/vhosts/forums/htdocs/.htaccess: - file.rename: - - source: /srv/www/vhosts/forums/htdocs/htaccess.txt - -/srv/www/vhosts/forums/htdocs/config.php: - file.rename: - - source: /srv/www/vhosts/forums/htdocs/config.php.bkp - -/srv/www/vhosts/forums/htdocs/core/includes/config.php: - file.rename: - - source: /srv/www/vhosts/forums/htdocs/core/includes/config.php.new - -{% for key1, values in pillar.vbulletin.config.items() %} -{% for key2, value in values.items() %} - -configure vBulletin {{key1}}-{{key2}}: - file.line: - - name: /srv/www/vhosts/forums/htdocs/core/includes/config.php - - match: "^(// )?\\$config\\['{{key1}}']\\['{{key2}}']" - - content: "$config['{{key1}}']['{{key2}}'] = '{{value}}';" - - mode: replace - -{% endfor %} -{% endfor %} - -/srv/www/vhosts/forums/htdocs/core/includes/md5_sums_vbulletin.php: - file.managed: - - mode: 444 - - create: no - - replace: no - -/srv/www/vhosts/forums/htdocs/core/cache/css: - file.directory: - - user: nginx - - recurse: - - user - -/srv/www/vhosts/forums/sitemap: - file.directory: - - user: nginx - diff --git a/salt/profile/vbulletin/tools.sls b/salt/profile/vbulletin/tools.sls deleted file mode 100644 index e70df03..0000000 --- a/salt/profile/vbulletin/tools.sls +++ /dev/null @@ -1,49 +0,0 @@ -# NB: these tools should not be enabled in production - -{% set tools = salt['pillar.get']('vbulletin:tools', False) %} - -/srv/www/vhosts/forums/htdocs/core/install: -{% if tools %} - file.copy: - - source: /srv/www/vhosts/forums/upload/core/install - - preserve: True - - user: root - - group: nginx - - mode: 644 -{% else %} - file.absent -{% endif %} - -/srv/www/vhosts/forums/htdocs/vb_test.php: -{% if tools %} - file.managed: - - source: salt://profile/vbulletin/files/vb_test.php -{% else %} - file.absent -{% endif %} - -/srv/www/vhosts/forums/htdocs/info.php: -{% if tools %} - file.managed: - - contents: "" -{% else %} - file.absent -{% endif %} - -/srv/www/vhosts/forums/db-tweak.sql: -{% if tools %} - file.managed: - - source: salt://profile/vbulletin/files/db-tweak.sql - - template: jinja - - defaults: - dbname: {{ pillar.vbulletin.config.Database.dbname }} - host: {{ pillar.vbulletin.config.MasterServer.servername }} - username: {{ pillar.vbulletin.config.MasterServer.username }} - password: {{ pillar.vbulletin.config.MasterServer.password }} - bburl: {{ grains.weburls[0] ~ '/forum' }} - frontendurl: {{ grains.weburls[0] }} -{% else %} - file.absent -{% endif %} - - diff --git a/salt/role/web_forum.sls b/salt/role/web_forum.sls deleted file mode 100644 index 4db44b7..0000000 --- a/salt/role/web_forum.sls +++ /dev/null @@ -1,3 +0,0 @@ -include: - - profile.web.server.nginx - - profile.vbulletin